Mercurial > hg > freeDiameter
changeset 665:40d499a58376
Small cleanup
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 17 Jan 2011 11:13:49 +0900 |
| parents | c1ef1c39e8a5 |
| children | bee66d8ca38a |
| files | freeDiameterd/CMakeLists.txt include/freeDiameter/CMakeLists.txt |
| diffstat | 2 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/freeDiameterd/CMakeLists.txt Fri Jan 14 17:18:57 2011 +0900 +++ b/freeDiameterd/CMakeLists.txt Mon Jan 17 11:13:49 2011 +0900 @@ -9,7 +9,7 @@ VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV}) # The link command -TARGET_LINK_LIBRARIES(freeDiameterd libfdproto libfdcore) +TARGET_LINK_LIBRARIES(freeDiameterd libfdcore) #### ## INSTALL section ##
--- a/include/freeDiameter/CMakeLists.txt Fri Jan 14 17:18:57 2011 +0900 +++ b/include/freeDiameter/CMakeLists.txt Mon Jan 17 11:13:49 2011 +0900 @@ -68,7 +68,7 @@ ENDIF (HAVE_CLOCK_GETTIME) # LFDPROTO_LIBS = libraries required by the libfdproto. -SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT}) +SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE) # dlopen and dlclose: CMAKE_DL_LIBS @@ -118,7 +118,7 @@ # LFDCORE_LIBS = libraries required by the libfdcore -SET(LFDCORE_LIBS ${CMAKE_DL_LIBS} ${SCTP_LIBRARIES} ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES}) +SET(LFDCORE_LIBS ${CMAKE_DL_LIBS} ${SCTP_LIBRARIES} ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES} PARENT_SCOPE) ########################## # Create the absolute path for searching extensions @@ -129,11 +129,6 @@ # Generate the host.h file CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeDiameter-host.h.in ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h) -# Save some variables for the other directories -SET(LFDPROTO_LIBS ${LFDPROTO_LIBS} PARENT_SCOPE) -SET(LFDCORE_LIBS ${LFDCORE_LIBS} PARENT_SCOPE) -SET(CMAKE_THREAD_LIBS_INIT ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE) - #### ## INSTALL section ##