diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 11:43:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 11:43:06 +0300 |
commit | afacd184982e58a9c830a3d5366e25983939a7ba (patch) | |
tree | 311ee6e5abfcda32e3cbad133276512d68abe25b /source/blenderplayer | |
parent | 70df57df0f82be3966a09c8548bfde23fd5c17c4 (diff) |
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 108 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 28 |
2 files changed, 68 insertions, 68 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index fa6521e7f8d..46a1d41d098 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -24,48 +24,48 @@ # # ***** END GPL LICENSE BLOCK ***** -MESSAGE(STATUS "Configuring blenderplayer") +message(STATUS "Configuring blenderplayer") -SETUP_LIBDIRS() +setup_libdirs() -IF(WITH_CODEC_QUICKTIME) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_CODEC_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - ADD_DEFINITIONS(-DWITH_BINRELOC) - INCLUDE_DIRECTORIES(${BINRELOC_INC}) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + add_definitions(-DWITH_BINRELOC) + include_directories(${BINRELOC_INC}) +endif() -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/ DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ) -IF(WIN32 AND NOT UNIX) - ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc) -ELSE(WIN32 AND NOT UNIX) - ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c) -ENDIF(WIN32 AND NOT UNIX) +if(WIN32 AND NOT UNIX) + add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc) +else() + add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c) +endif() -ADD_DEPENDENCIES(blenderplayer makesdna) +add_dependencies(blenderplayer makesdna) -GET_PROPERTY(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) +get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) -LIST(APPEND BLENDER_LINK_LIBS +list(APPEND BLENDER_LINK_LIBS ge_player_common ge_player_ghost blenkernel_blc ) -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - LIST(APPEND BLENDER_LINK_LIBS extern_binreloc) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + list(APPEND BLENDER_LINK_LIBS extern_binreloc) +endif() -IF(UNIX) +if(UNIX) # Sort libraries - SET(BLENDER_SORTED_LIBS + set(BLENDER_SORTED_LIBS ge_player_ghost ge_player_common bf_intern_string @@ -123,34 +123,34 @@ IF(UNIX) bf_blenkernel # duplicate for linking ) - IF(WITH_CODEC_QUICKTIME) - LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime) - ENDIF(WITH_CODEC_QUICKTIME) - - IF(WITH_CXX_GUARDEDALLOC) - LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp) - ENDIF(WITH_CXX_GUARDEDALLOC) - - FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) - SET(REMLIB ${SORTLIB}) - FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS}) - IF(${SEARCHLIB} STREQUAL ${SORTLIB}) - SET(REMLIB "") - ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB}) - ENDFOREACH(SEARCHLIB) - IF(REMLIB) - MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") - LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) - ENDIF(REMLIB) - ENDFOREACH(SORTLIB) - - TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS}) -ELSE(UNIX) - TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS}) -ENDIF(UNIX) - -IF(WITH_PLAYER) - ADD_SUBDIRECTORY(bad_level_call_stubs) -ENDIF(WITH_PLAYER) - -SETUP_LIBLINKS(blenderplayer) + if(WITH_CODEC_QUICKTIME) + list(APPEND BLENDER_SORTED_LIBS bf_quicktime) + endif() + + if(WITH_CXX_GUARDEDALLOC) + list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp) + endif() + + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) + set(REMLIB ${SORTLIB}) + foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) + if(${SEARCHLIB} STREQUAL ${SORTLIB}) + set(REMLIB "") + endif() + endforeach() + if(REMLIB) + message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") + list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) + endif() + endforeach() + + target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) +else() + target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS}) +endif() + +if(WITH_PLAYER) + add_subdirectory(bad_level_call_stubs) +endif() + +setup_liblinks(blenderplayer) diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 28510b0a113..0974438c272 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -25,9 +25,9 @@ # ***** END GPL LICENSE BLOCK ***** # this warning on generated files gets annoying -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC . .. ../../../intern/guardedalloc @@ -36,23 +36,23 @@ SET(INC ../../../source/blender/blenkernel ) -SET(SRC +set(SRC stubs.c ) -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DBUILD_DATE) - LIST(APPEND SRC +if(WITH_BUILDINFO) + add_definitions(-DBUILD_DATE) + list(APPEND SRC ../../creator/buildinfo.c ) -ENDIF(WITH_BUILDINFO) +endif() -IF(WITH_GAMEENGINE) - ADD_DEFINITIONS(-DWITH_GAMEENGINE) -ENDIF(WITH_GAMEENGINE) +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +endif() -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_FREETYPE2) +endif() -BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}") +blenderlib_nolist(blenkernel_blc "${SRC}" "${INC}") |