Revision: 34486
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34486
Author: campbellbarton
Date: 2011-01-25 14:43:13 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
use cmake defined names for jpeg, png, zlib and python libs, building on *nix
with non-standard libjpeg/png/zlib locations was broken.
in the case of python this makes it easier to move to find_package(PythonLibs)
when 3.x is supported.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/doc/build_systems/cmake.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/avi/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/gameengine/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-01-25 08:35:10 UTC (rev 34485)
+++ trunk/blender/CMakeLists.txt 2011-01-25 14:43:13 UTC (rev 34486)
@@ -166,9 +166,9 @@
# For alternate Python locations the commandline can be used to override
detected/default cache settings, e.g:
# On Unix:
-# cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D
PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+# cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so -D
PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
# On Macs:
-# cmake -D
PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-D
PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config
-G Xcode ../blender
+# cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-D
PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config
-G Xcode ../blender
#
# When changing any of this remember to update the notes in
doc/build_systems/cmake.txt
@@ -227,11 +227,11 @@
# find_package(PythonLibs)
set(PYTHON /usr)
set(PYTHON_VERSION 3.1)
- set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}"
CACHE STRING "")
- mark_as_advanced(PYTHON_INC)
+ set(PYTHON_INCLUDE_DIRS
"${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ mark_as_advanced(PYTHON_INCLUDE_DIRS)
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
- mark_as_advanced(PYTHON_LIB)
+ set(PYTHON_LIBRARY python${PYTHON_VERSION} CACHE STRING "")
+ mark_as_advanced(PYTHON_LIBRARY)
set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
mark_as_advanced(PYTHON_LIBPATH)
# find_package(PythonInterp) # not used yet
@@ -246,6 +246,7 @@
mark_as_advanced(SDLMAIN_LIBRARY)
mark_as_advanced(SDL_INCLUDE_DIR)
mark_as_advanced(SDL_LIBRARY)
+ mark_as_advanced(SDL_LIBRARY_TEMP)
# unset(SDLMAIN_LIBRARY CACHE)
if(NOT SDL_FOUND)
set(WITH_SDL OFF)
@@ -411,12 +412,12 @@
endif()
set(PNG "${LIBDIR}/png")
- set(PNG_INC "${PNG}/include")
- set(PNG_LIBPATH ${PNG}/lib)
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(JPEG "${LIBDIR}/jpeg")
- set(JPEG_INC "${JPEG}/include")
- set(JPEG_LIBPATH ${JPEG}/lib)
+ set(JPEG_INCLUDE_DIR "${JPEG}/include")
+ set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
set(WINTAB_INC ${LIBDIR}/wintab/include)
@@ -495,10 +496,10 @@
else()
set(PNG_LIBRARIES libpng_st)
endif()
- set(JPEG_LIBRARY libjpeg)
+ set(JPEG_LIBRARIES libjpeg)
set(ZLIB ${LIBDIR}/zlib)
- set(ZLIB_INC ${ZLIB}/include)
+ set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
set(ZLIB_LIBPATH ${ZLIB}/lib)
if(CMAKE_CL_64)
set(ZLIB_LIBRARIES libz)
@@ -576,9 +577,9 @@
if(WITH_PYTHON)
set(PYTHON ${LIBDIR}/python)
set(PYTHON_VERSION 3.1)
- set(PYTHON_INC
"${PYTHON}/include/python${PYTHON_VERSION}")
+ set(PYTHON_INCLUDE_DIRS
"${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIB python31)
+ set(PYTHON_LIBRARY python31)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()
@@ -613,11 +614,11 @@
set(GETTEXT_LIB intl)
endif()
- set(JPEG_LIBRARY libjpeg)
+ set(JPEG_LIBRARIES libjpeg)
set(PNG_LIBRARIES png)
set(ZLIB ${LIBDIR}/zlib)
- set(ZLIB_INC ${ZLIB}/include)
+ set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
set(ZLIB_LIBPATH ${ZLIB}/lib)
set(ZLIB_LIBRARIES z)
@@ -683,9 +684,9 @@
if(WITH_PYTHON)
set(PYTHON ${LIBDIR}/python)
set(PYTHON_VERSION 3.1)
- set(PYTHON_INC
"${PYTHON}/include/python${PYTHON_VERSION}")
+ set(PYTHON_INCLUDE_DIRS
"${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIB python31mw)
+ set(PYTHON_LIBRARY python31mw)
set(PYTHON_LIBPATH ${PYTHON}/lib)
endif()
@@ -737,9 +738,9 @@
# we use precompiled libraries for py 3.1 and up by default
set(PYTHON ${LIBDIR}/python)
- set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ set(PYTHON_INCLUDE_DIRS
"${PYTHON}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") #
not used yet
- set(PYTHON_LIB python${PYTHON_VERSION})
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
set(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with
this enabled
else()
@@ -747,9 +748,9 @@
set(PYTHON
/System/Library/Frameworks/Python.framework/Versions/)
set(PYTHON_VERSION 3.1)
- set(PYTHON_INC
"${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
+ set(PYTHON_INCLUDE_DIRS
"${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY
${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIB "")
+ set(PYTHON_LIBRARY "")
set(PYTHON_LIBPATH
${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System
-framework Python")
endif()
@@ -769,10 +770,10 @@
endif()
set(PNG_LIBRARIES png)
- set(JPEG_LIBRARY jpeg)
+ set(JPEG_LIBRARIES jpeg)
set(ZLIB /usr)
- set(ZLIB_INC "${ZLIB}/include")
+ set(ZLIB_INCLUDE_DIRS "${ZLIB}/include")
set(ZLIB_LIBRARIES z bz2)
set(FREETYPE ${LIBDIR}/freetype)
@@ -852,11 +853,11 @@
endif()
set(PNG "${LIBDIR}/png")
- set(PNG_INC "${PNG}/include")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
set(PNG_LIBPATH ${PNG}/lib)
set(JPEG "${LIBDIR}/jpeg")
- set(JPEG_INC "${JPEG}/include")
+ set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib)
if(WITH_IMAGE_TIFF)
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-01-25 08:35:10 UTC
(rev 34485)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-01-25 14:43:13 UTC
(rev 34486)
@@ -128,10 +128,10 @@
target_link_libraries(${target} ${PYTHON_LINKFLAGS})
if(WIN32 AND NOT UNIX)
- target_link_libraries(${target} debug ${PYTHON_LIB}_d)
- target_link_libraries(${target} optimized ${PYTHON_LIB})
+ target_link_libraries(${target} debug
${PYTHON_LIBRARY}_d)
+ target_link_libraries(${target} optimized
${PYTHON_LIBRARY})
else()
- target_link_libraries(${target} ${PYTHON_LIB})
+ target_link_libraries(${target} ${PYTHON_LIBRARY})
endif()
endif()
Modified: trunk/blender/doc/build_systems/cmake.txt
===================================================================
--- trunk/blender/doc/build_systems/cmake.txt 2011-01-25 08:35:10 UTC (rev
34485)
+++ trunk/blender/doc/build_systems/cmake.txt 2011-01-25 14:43:13 UTC (rev
34486)
@@ -132,9 +132,9 @@
The commandline can be used to override detected/default settings, e.g:
On Unix:
- cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D
PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+ cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so
-D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles"
../blender
On Macs:
- cmake -D
PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-G Xcode ../blender
+ cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-G Xcode ../blender
Mote that this should only be needed once per build directory generation
because it will keep the overrides in CMakeCache.txt for subsequent runs.
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-01-25 08:35:10 UTC
(rev 34485)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-01-25 14:43:13 UTC
(rev 34486)
@@ -231,7 +231,7 @@
endif()
if(WITH_PYTHON)
- list(APPEND INC Python ${PYTHON_INC})
+ list(APPEND INC Python ${PYTHON_INCLUDE_DIRS})
set(PYTHONSRC
Python/AUD_PyAPI.cpp
Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt 2011-01-25 08:35:10 UTC (rev
34485)
+++ trunk/blender/intern/elbeem/CMakeLists.txt 2011-01-25 14:43:13 UTC (rev
34486)
@@ -26,8 +26,8 @@
set(INC
extern
- ${PNG_INC}
- ${ZLIB_INC}
+ ${PNG_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
)
set(SRC
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2011-01-25 08:35:10 UTC (rev
34485)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2011-01-25 14:43:13 UTC (rev
34486)
@@ -28,8 +28,8 @@
intern
../memutil
../../extern/bullet2/src
- ${PNG_INC}
- ${ZLIB_INC}
+ ${PNG_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
)
set(SRC
Modified: trunk/blender/source/blender/avi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/avi/CMakeLists.txt 2011-01-25 08:35:10 UTC
(rev 34485)
+++ trunk/blender/source/blender/avi/CMakeLists.txt 2011-01-25 14:43:13 UTC
(rev 34486)
@@ -27,7 +27,7 @@
set(INC
.
../../../intern/guardedalloc
- ${JPEG_INC}
+ ${JPEG_INCLUDE_DIR}
)
set(SRC
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-01-25
08:35:10 UTC (rev 34485)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-01-25
14:43:13 UTC (rev 34486)
@@ -49,7 +49,7 @@
../../../intern/opennl/extern
../../../intern/smoke/extern
../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
- ${ZLIB_INC}
+ ${ZLIB_INCLUDE_DIRS}
)
set(SRC
@@ -273,7 +273,7 @@
endif()
if(WITH_PYTHON)
- list(APPEND INC ../python ${PYTHON_INC})
+ list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
add_definitions(-DWITH_PYTHON)
endif()
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-01-25 08:35:10 UTC
(rev 34485)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
