Fixes for CMake.

This commit is contained in:
Chris Want
2008-01-22 05:34:53 +00:00
parent c4929f84f7
commit 659316e4f4
5 changed files with 25 additions and 10 deletions

View File

@@ -42,16 +42,18 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
../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 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
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 @@ IF(UNIX)
bf_moto
blender_python
bf_quicktime
extern_binreloc
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})