From d67e7a748e0ad57b21ce24a10460fae770b37061 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 12 Oct 2009 18:45:11 +0000 Subject: [PATCH] - Fixed building of static libs. Signed-off-by: Peter Lemenkov git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1531 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/diameter_client/lib_dbase/CMakeLists.txt | 3 +-- apps/py_sems/CMakeLists.txt | 7 +++++++ apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt | 1 - core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt | 1 - core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt | 1 - 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt index fabd6f86..62016f90 100644 --- a/apps/diameter_client/lib_dbase/CMakeLists.txt +++ b/apps/diameter_client/lib_dbase/CMakeLists.txt @@ -8,6 +8,5 @@ IF(OPENSSL_FOUND) ADD_DEFINITIONS(-DWITH_OPENSSL) ENDIF(OPENSSL_FOUND) -add_library(libdbase STATIC ${libdbase_SRCS}) -target_link_libraries(libdbase ${CMAKE_DL_LIBS}) +ADD_LIBRARY(libdbase STATIC ${libdbase_SRCS}) diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt index b9a9dc61..ca80ef10 100644 --- a/apps/py_sems/CMakeLists.txt +++ b/apps/py_sems/CMakeLists.txt @@ -17,7 +17,14 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) EXECUTE_PROCESS(COMMAND python-config --libs OUTPUT_VARIABLE PYTHON_LIB_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 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) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) diff --git a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt index 1b3f9f1a..f4a12993 100644 --- a/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt +++ b/apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt @@ -19,5 +19,4 @@ XmlRpcValue.cpp # Solaris: -lsocket -lnsl ADD_LIBRARY(xmlrpcpp STATIC ${xmlrpcpp_SRCS}) -TARGET_LINK_LIBRARIES(xmlrpcpp ${CMAKE_DL_LIBS}) diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt index ea84ce7d..90dda19f 100644 --- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt +++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt @@ -34,5 +34,4 @@ 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") -TARGET_LINK_LIBRARIES(libbinrpc ${CMAKE_DL_LIBS} pthread m) diff --git a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt index e7146685..eb433f3d 100644 --- a/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt +++ b/core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt @@ -25,5 +25,4 @@ syntFilter.c ) ADD_LIBRARY(libilbc STATIC ${ilbc_SRCS}) -TARGET_LINK_LIBRARIES(libilbc ${CMAKE_DL_LIBS})