diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 1cb7c25b6..382b878a0 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -203,6 +203,7 @@ ENDMACRO(GENERATE_ROBOT_DEF_FILE ROBOTNAME DEF_FILE) # CLONENAMES : The names of the clones to generate # VERSION : The VERSION of the libraries to produce (robot and its clones) (def: $VERSION). # SOVERSION : The SOVERSION of the libraries to produce (in the ldconfig meaning) (def: 0.0.0). +# WARNING: Not taken into account for the moment : might not work with GCC 4.5 or +. # # Example: # ROBOT_MODULE(NAME simplix VERSION 3.0.5 SOVERSION 0.0.0 @@ -267,11 +268,14 @@ MACRO(ROBOT_MODULE) ADD_LIBRARY(${RBM_NAME} SHARED ${RBM_SOURCES}) # Customize shared library versions and file prefix. - SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES VERSION ${RBM_VERSION}) IF(UNIX) # Use ldconfig version naming scheme + no "lib" prefix under Linux - SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES SOVERSION ${RBM_SOVERSION}) - ENDIF(UNIX) + SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES PREFIX "") + # Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) + #SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES VERSION ${RBM_VERSION}) + #SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES SOVERSION ${RBM_SOVERSION}) + ELSE() + SET_TARGET_PROPERTIES(${RBM_NAME} PROPERTIES VERSION ${RBM_VERSION}) + ENDIF() # Link/Run-time dependencies ADD_PLIB_LIBRARY(${RBM_NAME} sg) @@ -285,7 +289,9 @@ MACRO(ROBOT_MODULE) GET_TARGET_PROPERTY(MODLOC ${RBM_NAME} LOCATION) FOREACH(CLONENAME ${RBM_CLONENAMES}) SET(CLONE_MODLOC ${CLONENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) - IF(UNIX) + IF(FALSE) + #IF(UNIX) + # Might not work with GCC 4.5 or + (see above) ADD_CUSTOM_COMMAND(TARGET ${RBM_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${MODLOC} ${CLONE_MODLOC}.${RBM_VERSION}) ADD_CUSTOM_COMMAND(TARGET ${RBM_NAME} POST_BUILD diff --git a/src/libs/learning/CMakeLists.txt b/src/libs/learning/CMakeLists.txt index e1586bc14..27cc5ef50 100644 --- a/src/libs/learning/CMakeLists.txt +++ b/src/libs/learning/CMakeLists.txt @@ -22,7 +22,8 @@ ENDIF(WIN32) ADD_LIBRARY(learning SHARED ${LEARNING_SOURCES}) -SET_TARGET_PROPERTIES(learning PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(learning PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(WIN32) SD_INSTALL_FILES(BIN TARGETS learning) diff --git a/src/libs/raceengine/CMakeLists.txt b/src/libs/raceengine/CMakeLists.txt index e9cd13f4a..0ed7d8e1b 100644 --- a/src/libs/raceengine/CMakeLists.txt +++ b/src/libs/raceengine/CMakeLists.txt @@ -37,7 +37,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(raceengine SHARED ${RACEENGINE_SOURCES}) -SET_TARGET_PROPERTIES(raceengine PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(raceengine PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_SDLIB_LIBRARY(raceengine tgf tgfdata robottools diff --git a/src/libs/robottools/CMakeLists.txt b/src/libs/robottools/CMakeLists.txt index 43266706a..9896003d2 100644 --- a/src/libs/robottools/CMakeLists.txt +++ b/src/libs/robottools/CMakeLists.txt @@ -25,7 +25,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(robottools SHARED ${ROBOTTOOLS_SOURCES}) -SET_TARGET_PROPERTIES(robottools PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(robottools PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_PLIB_LIBRARY(robottools sg ul) ADD_SDLIB_LIBRARY(robottools tgf) diff --git a/src/libs/tgf/CMakeLists.txt b/src/libs/tgf/CMakeLists.txt index 67f9f555c..fcae7c7e8 100644 --- a/src/libs/tgf/CMakeLists.txt +++ b/src/libs/tgf/CMakeLists.txt @@ -31,7 +31,8 @@ ENDIF(WIN32) ADD_LIBRARY(tgf SHARED ${TGF_HEADERS} ${TGF_SOURCES}) -SET_TARGET_PROPERTIES(tgf PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(tgf PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH) ADD_LIBRARY(tgf_static STATIC ${TGF_HEADERS} ${TGF_SOURCES}) diff --git a/src/libs/tgfclient/CMakeLists.txt b/src/libs/tgfclient/CMakeLists.txt index b755d9e1d..28cbc42a8 100644 --- a/src/libs/tgfclient/CMakeLists.txt +++ b/src/libs/tgfclient/CMakeLists.txt @@ -35,7 +35,8 @@ ENDIF(WIN32) ADD_LIBRARY(tgfclient SHARED ${TGFCLIENT_SOURCES}) -SET_TARGET_PROPERTIES(tgfclient PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(tgfclient PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_PLIB_LIBRARY(tgfclient ul sg sl) ADD_SDLIB_LIBRARY(tgfclient tgf networking) diff --git a/src/libs/tgfdata/CMakeLists.txt b/src/libs/tgfdata/CMakeLists.txt index 5508f3bd3..c6f214fdc 100755 --- a/src/libs/tgfdata/CMakeLists.txt +++ b/src/libs/tgfdata/CMakeLists.txt @@ -26,7 +26,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(tgfdata SHARED ${TGFDATA_SOURCES}) -SET_TARGET_PROPERTIES(tgfdata PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(tgfdata PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH) ADD_LIBRARY(tgfdata_static STATIC ${TGFDATA_SOURCES}) diff --git a/src/libs/txml/CMakeLists.txt b/src/libs/txml/CMakeLists.txt index 9d4b4531e..94354e08c 100644 --- a/src/libs/txml/CMakeLists.txt +++ b/src/libs/txml/CMakeLists.txt @@ -40,7 +40,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(txml SHARED ${TXML_SOURCES}) -SET_TARGET_PROPERTIES(txml PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(txml PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH) ADD_LIBRARY(txml_static STATIC ${TXML_SOURCES}) diff --git a/src/modules/graphic/ssggraph/CMakeLists.txt b/src/modules/graphic/ssggraph/CMakeLists.txt index fa835cbad..fef99ecb5 100644 --- a/src/modules/graphic/ssggraph/CMakeLists.txt +++ b/src/modules/graphic/ssggraph/CMakeLists.txt @@ -40,7 +40,8 @@ ENDIF(WIN32) ADD_LIBRARY(ssggraph SHARED ${SSGGRAPH_SOURCES}) -SET_TARGET_PROPERTIES(ssggraph PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(ssggraph PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(UNIX) SET_TARGET_PROPERTIES(ssggraph PROPERTIES PREFIX "") diff --git a/src/modules/networking/CMakeLists.txt b/src/modules/networking/CMakeLists.txt index a3c883f8f..8f60a85a0 100644 --- a/src/modules/networking/CMakeLists.txt +++ b/src/modules/networking/CMakeLists.txt @@ -11,7 +11,8 @@ endif(COMMAND cmake_policy) ADD_LIBRARY(networking SHARED ${SD_NETWORK_SOURCES}) -SET_TARGET_PROPERTIES(networking PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(networking PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_INTERFACE_INCLUDEDIR() ADD_SDL_INCLUDEDIR() diff --git a/src/modules/simu/simuv2.1/CMakeLists.txt b/src/modules/simu/simuv2.1/CMakeLists.txt index 611cf9455..4cbb2af7c 100644 --- a/src/modules/simu/simuv2.1/CMakeLists.txt +++ b/src/modules/simu/simuv2.1/CMakeLists.txt @@ -45,7 +45,8 @@ INCLUDE_DIRECTORIES(SOLID-2.0/include) ADD_LIBRARY(simuv2.1 SHARED ${SIMU_SOURCES}) -SET_TARGET_PROPERTIES(simuv2.1 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(simuv2.1 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_SDLIB_LIBRARY(simuv2.1 tgf robottools solid) diff --git a/src/modules/simu/simuv2/CMakeLists.txt b/src/modules/simu/simuv2/CMakeLists.txt index 6b048caa7..6613dfc87 100644 --- a/src/modules/simu/simuv2/CMakeLists.txt +++ b/src/modules/simu/simuv2/CMakeLists.txt @@ -24,7 +24,8 @@ ENDIF(WIN32) ADD_LIBRARY(simuv2 SHARED ${_SOURCES}) -SET_TARGET_PROPERTIES(simuv2 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(simuv2 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_SDLIB_LIBRARY(simuv2 tgf robottools solid) diff --git a/src/modules/simu/simuv3/CMakeLists.txt b/src/modules/simu/simuv3/CMakeLists.txt index fbdd5d45f..3dd7f71a3 100644 --- a/src/modules/simu/simuv3/CMakeLists.txt +++ b/src/modules/simu/simuv3/CMakeLists.txt @@ -24,7 +24,8 @@ ENDIF(WIN32) ADD_LIBRARY(simuv3 SHARED ${_SOURCES}) -SET_TARGET_PROPERTIES(simuv3 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(simuv3 PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) ADD_SDLIB_LIBRARY(simuv3 tgf robottools solid) diff --git a/src/modules/telemetry/CMakeLists.txt b/src/modules/telemetry/CMakeLists.txt index 3b9c6ee07..8ea1a942e 100644 --- a/src/modules/telemetry/CMakeLists.txt +++ b/src/modules/telemetry/CMakeLists.txt @@ -7,7 +7,8 @@ ADD_SDLIB_INCLUDEDIR(tgf portability) ADD_LIBRARY(telemetry SHARED ${TELEMETRY_SOURCES}) -SET_TARGET_PROPERTIES(telemetry PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(telemetry PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(UNIX) SET_TARGET_PROPERTIES(telemetry PROPERTIES PREFIX "") diff --git a/src/modules/track/CMakeLists.txt b/src/modules/track/CMakeLists.txt index eb42ad08c..152f455ac 100644 --- a/src/modules/track/CMakeLists.txt +++ b/src/modules/track/CMakeLists.txt @@ -17,7 +17,8 @@ ENDIF(WIN32) ADD_LIBRARY(track SHARED ${TRACK_SOURCES}) -SET_TARGET_PROPERTIES(track PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(track PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(UNIX) SET_TARGET_PROPERTIES(track PROPERTIES PREFIX "") diff --git a/src/modules/userinterface/legacymenu/CMakeLists.txt b/src/modules/userinterface/legacymenu/CMakeLists.txt index eae816268..58271fd30 100644 --- a/src/modules/userinterface/legacymenu/CMakeLists.txt +++ b/src/modules/userinterface/legacymenu/CMakeLists.txt @@ -65,7 +65,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(legacymenu SHARED ${LEGACYMENU_SOURCES}) -SET_TARGET_PROPERTIES(legacymenu PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(legacymenu PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(UNIX) SET_TARGET_PROPERTIES(legacymenu PROPERTIES PREFIX "") diff --git a/src/modules/userinterface/textonly/CMakeLists.txt b/src/modules/userinterface/textonly/CMakeLists.txt index 34b151c61..0978cee78 100644 --- a/src/modules/userinterface/textonly/CMakeLists.txt +++ b/src/modules/userinterface/textonly/CMakeLists.txt @@ -24,7 +24,8 @@ ENDIF(COMMAND CMAKE_POLICY) ADD_LIBRARY(textonly SHARED ${_SOURCES}) -SET_TARGET_PROPERTIES(textonly PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) +# Might not work with GCC 4.5 or + (non-robot modules crash at 1st reload = after 1 dlclose) +#SET_TARGET_PROPERTIES(textonly PROPERTIES VERSION ${VERSION} SOVERSION 0.0.0) IF(UNIX) SET_TARGET_PROPERTIES(textonly PROPERTIES PREFIX "")