Mercurial > hg > freeDiameter
changeset 845:5c4cf8d15ef0 1.1.5-rc1
Well this time, I hope, should be the last fix to enable compilation on Darwin systems...
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Tue, 16 Oct 2012 21:10:14 +0200 |
| parents | 9b208543ba7f |
| children | 85e1a4118849 |
| files | CMakeLists.txt extensions/CMakeLists.txt extensions/app_diameap/CMakeLists.txt extensions/app_diameap/plugins/eap_tls/CMakeLists.txt extensions/app_radgw/CMakeLists.txt |
| diffstat | 5 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Oct 16 20:06:58 2012 +0200 +++ b/CMakeLists.txt Tue Oct 16 21:10:14 2012 +0200 @@ -74,6 +74,11 @@ # Add this to workaround an apparent bug in FreeBSD cmake (already defined in Linux) SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic") +# For Darwin systems +IF(APPLE) + SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress") +ENDIF(APPLE) + # Location for the include files INCLUDE_DIRECTORIES(include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
--- a/extensions/CMakeLists.txt Tue Oct 16 20:06:58 2012 +0200 +++ b/extensions/CMakeLists.txt Tue Oct 16 21:10:14 2012 +0200 @@ -10,7 +10,6 @@ ADD_LIBRARY(${EXTNAME} MODULE ${ARGN}) SET_TARGET_PROPERTIES(${EXTNAME} PROPERTIES PREFIX "" ) SET_TARGET_PROPERTIES(${EXTNAME} PROPERTIES SUFFIX ".fdx" ) - TARGET_LINK_LIBRARIES(${EXTNAME} libfdproto libfdcore) ENDMACRO(FD_ADD_EXTENSION) # Use the macro FD_EXTENSION_SUBDIR(extmacroname subdir descr default) to
--- a/extensions/app_diameap/CMakeLists.txt Tue Oct 16 20:06:58 2012 +0200 +++ b/extensions/app_diameap/CMakeLists.txt Tue Oct 16 21:10:14 2012 +0200 @@ -46,8 +46,6 @@ FD_ADD_EXTENSION(app_diameap ${diameapsrc}) -TARGET_LINK_LIBRARIES(app_diameap ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES} ${MySQL_LIBRARY} ) - #### ## INSTALL section ##
--- a/extensions/app_diameap/plugins/eap_tls/CMakeLists.txt Tue Oct 16 20:06:58 2012 +0200 +++ b/extensions/app_diameap/plugins/eap_tls/CMakeLists.txt Tue Oct 16 21:10:14 2012 +0200 @@ -15,4 +15,3 @@ eaptls.tab.h ) -TARGET_LINK_LIBRARIES(eap_tls ${GNUTLS_LIBRARIES})
--- a/extensions/app_radgw/CMakeLists.txt Tue Oct 16 20:06:58 2012 +0200 +++ b/extensions/app_radgw/CMakeLists.txt Tue Oct 16 21:10:14 2012 +0200 @@ -54,10 +54,6 @@ ADD_LIBRARY(${PLGNAME} MODULE ${ARGN}) SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES PREFIX "" ) SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES SUFFIX ".rgwx" ) - #MAC OS X - IF (APPLE) - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-flat_namespace,-undefined,warning") - ENDIF(APPLE) INSTALL(TARGETS ${PLGNAME} LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX} COMPONENT freeDiameter-radius-gateway)