bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

minor changes to cmake, main noticable change is to disable RULE_MESSAGES which gives less output with makefiles (easier to spot warnings).

Browse Source
This commit is contained in:
Campbell Barton 2010-06-07 14:28:37 +00:00
parent d57ebc4ecc
commit ab0d12a3b6
1 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
CMakeLists.txt
View File

@ -43,6 +43,10 @@ Remove the CMakeCache.txt file and try again from another folder, e.g.:
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
# quiet output for Makefiles, 'make -s' helps too
SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
PROJECT(Blender) PROJECT(Blender)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -144,7 +148,6 @@ INCLUDE(CMake/macros.cmake)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
IF(WITH_OPENAL) IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL) FIND_PACKAGE(OpenAL)
IF(NOT OPENAL_FOUND) IF(NOT OPENAL_FOUND)
@ -166,20 +169,23 @@ IF(UNIX AND NOT APPLE)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib) SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE) ENDIF(WITH_SNDFILE)
FIND_LIBRARY(INTL_LIBRARY IF(WITH_INTERNATIONAL)
NAMES intl FIND_LIBRARY(INTL_LIBRARY
PATHS NAMES intl
/sw/lib PATHS
) /sw/lib
FIND_LIBRARY(ICONV_LIBRARY )
NAMES iconv
PATHS FIND_LIBRARY(ICONV_LIBRARY
/sw/lib NAMES iconv
) PATHS
/sw/lib
IF(INTL_LIBRARY AND ICONV_LIBRARY) )
SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
ENDIF(INTL_LIBRARY AND ICONV_LIBRARY) IF(INTL_LIBRARY AND ICONV_LIBRARY)
SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
ENDIF(WITH_INTERNATIONAL)
FIND_PACKAGE(Freetype) FIND_PACKAGE(Freetype)
# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
@ -323,10 +329,12 @@ IF(WIN32)
ADD_DEFINITIONS(-DWIN32) ADD_DEFINITIONS(-DWIN32)
SET(ICONV ${LIBDIR}/iconv) IF(WITH_INTERNATIONAL)
SET(ICONV_INC ${ICONV}/include) SET(ICONV ${LIBDIR}/iconv)
SET(ICONV_LIB iconv) SET(ICONV_INC ${ICONV}/include)
SET(ICONV_LIBPATH ${ICONV}/lib) SET(ICONV_LIB iconv)
SET(ICONV_LIBPATH ${ICONV}/lib)
ENDIF(WITH_INTERNATIONAL)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate) SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include) SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
@ -404,14 +412,16 @@ IF(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
SET(GETTEXT ${LIBDIR}/gettext) IF(WITH_INTERNATIONAL)
SET(GETTEXT_INC ${GETTEXT}/include) SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib) SET(GETTEXT_INC ${GETTEXT}/include)
IF(CMAKE_CL_64) SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
SET(GETTEXT_LIB gettext) IF(CMAKE_CL_64)
ELSE(CMAKE_CL_64) SET(GETTEXT_LIB gettext)
SET(GETTEXT_LIB gnu_gettext) ELSE(CMAKE_CL_64)
ENDIF(CMAKE_CL_64) SET(GETTEXT_LIB gnu_gettext)
ENDIF(CMAKE_CL_64)
ENDIF(WITH_INTERNATIONAL)
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
SET(PNG_LIBRARIES libpng) SET(PNG_LIBRARIES libpng)
@ -526,10 +536,12 @@ IF(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
SET(GETTEXT ${LIBDIR}/gcc/gettext) IF(WITH_INTERNATIONAL)
SET(GETTEXT_INC ${GETTEXT}/include) SET(GETTEXT ${LIBDIR}/gcc/gettext)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib) SET(GETTEXT_INC ${GETTEXT}/include)
SET(GETTEXT_LIB intl) SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
SET(GETTEXT_LIB intl)
ENDIF(WITH_INTERNATIONAL)
SET(JPEG_LIBRARY jpeg) SET(JPEG_LIBRARY jpeg)
SET(PNG_LIBRARIES png) SET(PNG_LIBRARIES png)
@ -818,10 +830,11 @@ ENDIF(WITH_BUILDINFO)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Common. # Common.
IF(WITH_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG}) set(OPENJPEG_INC ${OPENJPEG})
set(OPENJPEG_LIb extern_libopenjpeg) set(OPENJPEG_LIb extern_libopenjpeg)
ENDIF(WITH_OPENJPEG)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Blender WebPlugin # Blender WebPlugin