diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
| commit | 04b0dcd9e53206d3208c0a846d2e52f262bad985 (patch) | |
| tree | 1b21679c6c12019bb3663e0277fe54ce979a2726 /source/creator | |
| parent | eef3b72c0e64c01ef8a8d1a84c42377a1b2973e0 (diff) | |
- use list append in more places (preferred method since its faster)
- remove some unused include paths
- remove unused linux path define
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ea6507bfc7b..c4e01ba1a9d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -82,12 +82,6 @@ IF(NOT WITH_SDL) ADD_DEFINITIONS(-DDISABLE_SDL) ENDIF(NOT WITH_SDL) -IF(UNIX AND NOT APPLE) - SET(BLENDERPATH ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) - # blender_path in creator.c - ADD_DEFINITIONS(-DBLENDERPATH="${BLENDERPATH}") -ENDIF(UNIX AND NOT APPLE) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ADD_DEFINITIONS(-DWITH_BINRELOC) INCLUDE_DIRECTORIES(${BINRELOC_INC}) @@ -97,7 +91,7 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(EXESRC creator.c) IF(WIN32) - SET(EXESRC ${EXESRC} ../icons/winblender.rc) + LIST(APPEND EXESRC ../icons/winblender.rc) ENDIF(WIN32) IF(WITH_BUILDINFO) @@ -107,7 +101,7 @@ IF(WITH_BUILDINFO) ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}") ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}") - SET(EXESRC ${EXESRC} buildinfo.c) + LIST(APPEND EXESRC buildinfo.c) ENDIF(WITH_BUILDINFO) MESSAGE(STATUS "Configuring blender") @@ -440,11 +434,11 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS) SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render) IF(WITH_FLUID) - SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_intern_elbeem) + LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) ENDIF(WITH_FLUID) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc) + LIST(APPEND BLENDER_LINK_LIBS extern_binreloc) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") #IF(UNIX) @@ -562,11 +556,11 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") ) IF(WITH_CXX_GUARDEDALLOC) - SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp) + LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp) ENDIF(WITH_CXX_GUARDEDALLOC) IF(WITH_QUICKTIME) - SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime) + LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime) ENDIF(WITH_QUICKTIME) |