Module: sems Branch: peterlemenkov/1.2.x-fedora Commit: 55ffb361589312b150c7d32bea046eb64ae84b41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=55ffb361589312b150c7d32bea046eb64ae84b41
Author: Peter Lemenkov <[email protected]> Committer: Peter Lemenkov <[email protected]> Date: Tue May 18 17:31:11 2010 +0000 More compatibility with older CMake (2.4). Signed-off-by: Peter Lemenkov <[email protected]> --- CMakeLists.txt | 2 +- apps/diameter_client/CMakeLists.txt | 2 -- apps/diameter_client/lib_dbase/CMakeLists.txt | 1 + apps/py_sems/CMakeLists.txt | 3 --- apps/py_sems/sip/CMakeLists.txt | 1 + apps/xmlrpc2di/CMakeLists.txt | 3 --- apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt | 1 + cmake/config.rules.txt | 2 +- cmake/python.rules.txt | 4 ++-- core/plug-in/binrpcctrl/CMakeLists.txt | 3 --- .../binrpcctrl/libbinrpc/src/CMakeLists.txt | 1 + core/plug-in/ilbc/CMakeLists.txt | 3 --- core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt | 1 + 13 files changed, 9 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0d749a..0cfb538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) PROJECT (SEMS) diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt index c510194..a7ce86a 100644 --- a/apps/diameter_client/CMakeLists.txt +++ b/apps/diameter_client/CMakeLists.txt @@ -6,8 +6,6 @@ ServerConnection.cpp ADD_SUBDIRECTORY (lib_dbase) INCLUDE_DIRECTORIES (lib_dbase) -SET_PROPERTY(TARGET libdbase PROPERTY IMPORTED_LOCATION ./lib_dbase/libdbase.a) - SET(sems_module_name diameter_client) SET(sems_module_libs libdbase) diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt index 62016f9..138f636 100644 --- a/apps/diameter_client/lib_dbase/CMakeLists.txt +++ b/apps/diameter_client/lib_dbase/CMakeLists.txt @@ -9,4 +9,5 @@ IF(OPENSSL_FOUND) ENDIF(OPENSSL_FOUND) ADD_LIBRARY(libdbase STATIC ${libdbase_SRCS}) +ADD_CUSTOM_COMMAND(TARGET libdbase POST_BUILD COMMAND cp ARGS liblibdbase.a libliblibdbase.a) diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt index 91bc246..40b7be3 100644 --- a/apps/py_sems/CMakeLists.txt +++ b/apps/py_sems/CMakeLists.txt @@ -18,11 +18,8 @@ EXECUTE_PROCESS(COMMAND python-config --libs OUTPUT_VARIABLE PYTHON_LIB_FLAGS OU SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PYTHON_LIB_FLAGS}") ADD_SUBDIRECTORY (sip) - INCLUDE_DIRECTORIES (sip) -SET_PROPERTY(TARGET sip PROPERTY IMPORTED_LOCATION ./sip/sip.a) - SET(sems_module_name py_sems) SET(sems_module_libs sip) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/apps/py_sems/sip/CMakeLists.txt b/apps/py_sems/sip/CMakeLists.txt index edcd6d7..81d4df4 100644 --- a/apps/py_sems/sip/CMakeLists.txt +++ b/apps/py_sems/sip/CMakeLists.txt @@ -18,4 +18,5 @@ sippy_sems_libstring.cpp EXECUTE_PROCESS(COMMAND python configure.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ADD_LIBRARY(sip STATIC ${sip_SRCS}) +ADD_CUSTOM_COMMAND(TARGET sip POST_BUILD COMMAND cp ARGS libsip.a liblibsip.a) diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt index d4ef304..a11ac3b 100644 --- a/apps/xmlrpc2di/CMakeLists.txt +++ b/apps/xmlrpc2di/CMakeLists.txt @@ -5,11 +5,8 @@ XMLRPC2DI.cpp ) ADD_SUBDIRECTORY (xmlrpc++) - INCLUDE_DIRECTORIES (xmlrpc++/src) -SET_PROPERTY(TARGET xmlrpcpp PROPERTY IMPORTED_LOCATION ./xmlrpc++/src/xmlrpcpp.a) - SET(sems_module_name xmlrpc2di) SET(sems_module_libs xmlrpcpp) diff --git a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt index f4a1299..42a4b34 100644 --- a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt +++ b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt @@ -19,4 +19,5 @@ XmlRpcValue.cpp # Solaris: -lsocket -lnsl ADD_LIBRARY(xmlrpcpp STATIC ${xmlrpcpp_SRCS}) +ADD_CUSTOM_COMMAND(TARGET xmlrpcpp POST_BUILD COMMAND cp ARGS libxmlrpcpp.a liblibxmlrpcpp.a) diff --git a/cmake/config.rules.txt b/cmake/config.rules.txt index 1bc81d8..a04a4d5 100644 --- a/cmake/config.rules.txt +++ b/cmake/config.rules.txt @@ -1,6 +1,6 @@ FOREACH (config_file ${sems_module_name} ${sems_config_files}) # Check whether we providing a template for this config - FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ./etc) + FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ${CMAKE_CURRENT_SOURCE_DIR}/etc) IF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE) # If we do provide a template, then process it and create real diff --git a/cmake/python.rules.txt b/cmake/python.rules.txt index 54f7880..b7d37ad 100644 --- a/cmake/python.rules.txt +++ b/cmake/python.rules.txt @@ -1,7 +1,7 @@ -FUNCTION(PYTHON_SOURCES_COMPILE python_files sems_python_dir) +MACRO(PYTHON_SOURCES_COMPILE python_files sems_python_dir) FOREACH (python_file ${python_files}) EXECUTE_PROCESS(COMMAND python -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')") EXECUTE_PROCESS(COMMAND python -O -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')") INSTALL (FILES ${python_file} ${python_file}c ${python_file}o DESTINATION ${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/${sems_python_dir}) ENDFOREACH(python_file ${python_files}) -ENDFUNCTION() +ENDMACRO(PYTHON_SOURCES_COMPILE python_files sems_python_dir) diff --git a/core/plug-in/binrpcctrl/CMakeLists.txt b/core/plug-in/binrpcctrl/CMakeLists.txt index 27ced92..3899407 100644 --- a/core/plug-in/binrpcctrl/CMakeLists.txt +++ b/core/plug-in/binrpcctrl/CMakeLists.txt @@ -5,11 +5,8 @@ CtrlServer.cpp ) ADD_SUBDIRECTORY (libbinrpc) - INCLUDE_DIRECTORIES (libbinrpc/include) -SET_PROPERTY(TARGET libbinrpc PROPERTY IMPORTED_LOCATION ./libbinrpc/src/binrpcctrl.a) - SET(sems_module_name binrpcctrl) SET(sems_module_libs libbinrpc) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt index 90dda19..a8df076 100644 --- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt +++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt @@ -34,4 +34,5 @@ ADD_DEFINITIONS(-DBINRPC_LIB_VER="1.0-1" -D_LIBBINRPC_BUILD -DNDEBUG) ADD_LIBRARY(libbinrpc STATIC ${libbinrpc_SRCS}) SET_TARGET_PROPERTIES(libbinrpc PROPERTIES OUTPUT_NAME "libbinrpc") +ADD_CUSTOM_COMMAND(TARGET libbinrpc POST_BUILD COMMAND cp ARGS liblibbinrpc.a libliblibbinrpc.a) diff --git a/core/plug-in/ilbc/CMakeLists.txt b/core/plug-in/ilbc/CMakeLists.txt index 959f268..1f4dcfb 100644 --- a/core/plug-in/ilbc/CMakeLists.txt +++ b/core/plug-in/ilbc/CMakeLists.txt @@ -3,11 +3,8 @@ set (ilbc_SRCS ) ADD_SUBDIRECTORY (iLBC_rfc3951) - INCLUDE_DIRECTORIES (iLBC_rfc3951) -SET_PROPERTY(TARGET libilbc PROPERTY IMPORTED_LOCATION ./iLBC_rfc3951/ilbc.a) - SET(sems_module_name ilbc) SET(sems_module_libs libilbc) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt index eb433f3..7f5bcf5 100644 --- a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt +++ b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt @@ -25,4 +25,5 @@ syntFilter.c ) ADD_LIBRARY(libilbc STATIC ${ilbc_SRCS}) +ADD_CUSTOM_COMMAND(TARGET libilbc POST_BUILD COMMAND cp ARGS liblibilbc.a libliblibilbc.a) _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
