From: Jaka K. <lyn...@us...> - 2012-09-13 09:21:56
|
gemrb: Infinity Engine emulator The branch master has been updated via 829453dfb75269acc96f1dacaa6733b15ddc96d5 (commit) via dafd510017f3a893f84dd908c5e008a1fddeaafe (commit) Summary of changes: CMakeLists.txt | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) from 8bad3ea32524ce92e371a3b039ad6d32bf92d895 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=829453dfb75269acc96f1dacaa6733b15ddc96d5 commit 829453dfb75269acc96f1dacaa6733b15ddc96d5 Author: Jaka Kranjc <lyn...@us...> Date: Thu Sep 13 11:16:19 2012 +0200 cmake: converted rogue space indentation diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bcd621..ee5b992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,22 +330,22 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name) endif (APPLE) endif (${ARGV1} STREQUAL "COCOA") - if (STATIC_LINK) - ADD_LIBRARY(${plugin_name} STATIC ${PLUGIN_BUILD_FILES}) - set(plugins "${plugins};${plugin_name}" PARENT_SCOPE) - else (STATIC_LINK) - ADD_LIBRARY(${plugin_name} MODULE ${PLUGIN_BUILD_FILES}) - if (NOT UNSAFE_PLUGIN) - TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core ${CMAKE_THREAD_LIBS_INIT}) - endif (NOT UNSAFE_PLUGIN) - if (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") - TARGET_LINK_LIBRARIES(${plugin_name} -shared-libgcc) - endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") - INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR}) - endif (STATIC_LINK) - SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX "" - INSTALL_RPATH ${LIB_DIR} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/plugins) + if (STATIC_LINK) + ADD_LIBRARY(${plugin_name} STATIC ${PLUGIN_BUILD_FILES}) + set(plugins "${plugins};${plugin_name}" PARENT_SCOPE) + else (STATIC_LINK) + ADD_LIBRARY(${plugin_name} MODULE ${PLUGIN_BUILD_FILES}) + if (NOT UNSAFE_PLUGIN) + TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core ${CMAKE_THREAD_LIBS_INIT}) + endif (NOT UNSAFE_PLUGIN) + if (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") + TARGET_LINK_LIBRARIES(${plugin_name} -shared-libgcc) + endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") + INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR}) + endif (STATIC_LINK) + SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX "" + INSTALL_RPATH ${LIB_DIR} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/plugins) ENDMACRO(ADD_GEMRB_PLUGIN) #gemrb overrides macro http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=dafd510017f3a893f84dd908c5e008a1fddeaafe commit dafd510017f3a893f84dd908c5e008a1fddeaafe Author: Jaka Kranjc <lyn...@us...> Date: Thu Sep 13 11:13:15 2012 +0200 cmake: incorporated part of netbsd's downstream patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 34dd0f6..6bcd621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,6 +338,9 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name) if (NOT UNSAFE_PLUGIN) TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core ${CMAKE_THREAD_LIBS_INIT}) endif (NOT UNSAFE_PLUGIN) + if (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") + TARGET_LINK_LIBRARIES(${plugin_name} -shared-libgcc) + endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR}) endif (STATIC_LINK) SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX "" ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |