[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13350] trunk/blender: Fixes for CMake.
Chris Want
cwant at ualberta.ca
Tue Jan 22 06:34:56 CET 2008
Revision: 13350
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13350
Author: hos
Date: 2008-01-22 06:34:53 +0100 (Tue, 22 Jan 2008)
Log Message:
-----------
Fixes for CMake.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/extern/CMakeLists.txt
trunk/blender/extern/binreloc/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2008-01-22 04:27:23 UTC (rev 13349)
+++ trunk/blender/CMakeLists.txt 2008-01-22 05:34:53 UTC (rev 13350)
@@ -67,7 +67,6 @@
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
-OPTION(WITH_BINRELOC "Enable binreloc filepath support" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -257,9 +256,6 @@
SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
- SET(BINRELC ${LIBDIR}/binreloc)
- SET(BINRELC_INC ${BINRELOC}/include)
-
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
IF(WITH_OPENAL)
SET(LLIBS ${LLIBS} dxguid)
@@ -370,6 +366,11 @@
SET(EXETYPE MACOSX_BUNDLE)
ENDIF(APPLE)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+ SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
#-----------------------------------------------------------------------------
# Common.
SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)
Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt 2008-01-22 04:27:23 UTC (rev 13349)
+++ trunk/blender/extern/CMakeLists.txt 2008-01-22 05:34:53 UTC (rev 13350)
@@ -43,6 +43,6 @@
SUBDIRS(verse)
ENDIF(WITH_VERSE)
-if(WITH_BINRELOC)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SUBDIRS(binreloc)
-ENDIF(WITH_BINRELOC)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: trunk/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt 2008-01-22 04:27:23 UTC (rev 13349)
+++ trunk/blender/extern/binreloc/CMakeLists.txt 2008-01-22 05:34:53 UTC (rev 13350)
@@ -22,5 +22,5 @@
ADD_DEFINITIONS(-DWITH_BINRELOC)
FILE(GLOB SRC *.c)
-BLENDERLIB(binreloc "${SRC}" "${INC}")
+BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
#, libtype=['core','player'], priority = [25,15] )
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2008-01-22 04:27:23 UTC (rev 13349)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2008-01-22 05:34:53 UTC (rev 13350)
@@ -36,6 +36,13 @@
${ZLIB_INC}
)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+SET(INC
+ ${INC}
+ ${BINRELOC_INC}
+)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
IF(WITH_VERSE)
ADD_DEFINITIONS(-DWITH_VERSE)
SET(INC ${INC} ${VERSE_INC})
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2008-01-22 04:27:23 UTC (rev 13349)
+++ trunk/blender/source/creator/CMakeLists.txt 2008-01-22 05:34:53 UTC (rev 13350)
@@ -42,16 +42,18 @@
../blender/makesdna
../kernel/gen_messaging
../kernel/gen_system
- ../../extern/binreloc/include
)
+
+
IF(WITH_QUICKTIME)
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
-IF(WITH_BINRELOC)
+IF(LINUX)
ADD_DEFINITIONS(-DWITH_BINRELOC)
-endif(WITH_BINRELOC)
+ INCLUDE_DIRECTORIES(${BINRELOC_INC})
+endif(LINUX)
IF(YESIAMSTUPID)
ADD_DEFINITIONS(-DYESIAMSTUPID)
@@ -196,6 +198,10 @@
SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
IF(UNIX)
# Sort libraries
SET(BLENDER_SORTED_LIBS
@@ -259,6 +265,7 @@
bf_moto
blender_python
bf_quicktime
+ extern_binreloc
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
More information about the Bf-blender-cvs
mailing list