diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-10 15:39:47 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-10 15:39:47 +0100 |
| commit | cee6589f0dc39ffdbfe2c8faa1e8a0c40f848257 (patch) | |
| tree | d4513124eae88f70d1d3c3d7f1bfc27ccbee9614 | |
| parent | 2e03fd8ca7952aa9299f24d6d7628f56d062e66e (diff) | |
Convert the shared modules to static ones.
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e7b4eb..51ee858 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,6 +82,7 @@ IF ( WITH_OPENGL AND NOT BUILD_SERVER ) ADD_DEFINITIONS ( -DSUPPORT_OPENGL ) ENDIF ( WITH_OPENGL AND NOT BUILD_SERVER ) ############################################################################### +############################################################################### # SERVER COMPILATION ############################################################################### IF ( BUILD_SERVER ) @@ -98,6 +99,12 @@ ENDIF ( BUILD_SERVER ) ################################################################################ # INSTALLATION OF BINARY ################################################################################ +FILE ( GLOB _lib_files modules/mod*.c ) +FOREACH( _lib_file ${_lib_files} ) + GET_FILENAME_COMPONENT ( _lib ${_lib_file} NAME_WE ) + ADD_DEPENDENCIES ( ${APPNAME} ${_lib} ) + TARGET_LINK_LIBRARIES ( ${APPNAME} ${_lib} ) +ENDFOREACH ( _lib_file ${_lib_files} ) INSTALL ( TARGETS ${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} ) diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index ad2dba7..7a9070f 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -3,8 +3,6 @@ ############################################################################### # LINKING ( for modules ) ############################################################################### -SET ( SONAME_VERSION "0" CACHE STRING "SONAME Version" ) -MARK_AS_ADVANCED ( SONAME_VERSION ) LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) ############################################################################### # SOURCE SPECIFICATION @@ -32,10 +30,6 @@ SET ( SRC_base_modules FILE ( GLOB _lib_files mod*.c ) FOREACH ( _current_LIB_FILE ${_lib_files} ) GET_FILENAME_COMPONENT( _lib ${_current_LIB_FILE} NAME_WE ) - ADD_LIBRARY ( ${_lib} SHARED ${SRC_base_modules} ${_current_LIB_FILE} ) - SET_TARGET_PROPERTIES (${_lib} PROPERTIES VERSION ${TUXANCI_VERSION} SOVERSION ${SONAME_VERSION}) - INSTALL ( TARGETS ${_lib} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + ADD_LIBRARY ( ${_lib} STATIC ${SRC_base_modules} ${_current_LIB_FILE} ) ENDFOREACH ( _current_LIB_FILE ) ############################################################################### |