From dcf12779532c631f9c7d840a7238b8510af132f4 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 14 Jun 2010 10:30:17 +0200 Subject: [PATCH] Changed: #842 Added SOVERSION property to shared libraries --- code/nel/src/3d/CMakeLists.txt | 1 + code/nel/src/3d/driver/direct3d/CMakeLists.txt | 3 ++- code/nel/src/3d/driver/opengl/CMakeLists.txt | 1 + code/nel/src/cegui/CMakeLists.txt | 3 ++- code/nel/src/georges/CMakeLists.txt | 1 + code/nel/src/ligo/CMakeLists.txt | 6 +++--- code/nel/src/logic/CMakeLists.txt | 3 ++- code/nel/src/misc/CMakeLists.txt | 1 + code/nel/src/net/CMakeLists.txt | 3 ++- code/nel/src/pacs/CMakeLists.txt | 1 + code/nel/src/sound/CMakeLists.txt | 1 + code/nel/src/sound/driver/CMakeLists.txt | 1 + code/nel/src/sound/driver/dsound/CMakeLists.txt | 1 + code/nel/src/sound/driver/fmod/CMakeLists.txt | 5 +++-- code/nel/src/sound/driver/openal/CMakeLists.txt | 4 +++- code/nel/src/sound/driver/xaudio2/CMakeLists.txt | 4 +++- code/ryzom/client/src/seven_zip/CMakeLists.txt | 8 +++++--- code/ryzom/common/src/game_share/CMakeLists.txt | 4 +++- 18 files changed, 36 insertions(+), 15 deletions(-) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 34fe8ac56..37d935934 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -674,6 +674,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLU TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY}) SET_TARGET_PROPERTIES(nel3d PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL 3D") IF(WIN32) diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt index 677720d09..33c1c8375 100644 --- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt +++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt @@ -11,7 +11,8 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${DXSDK_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d ${LIBXML2_LIBRARIES} ${FREETYPE_LIB} ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) SET_TARGET_PROPERTIES(nel_drv_direct3d_win PROPERTIES - VERSION ${NL_VERSION} + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} LINK_FLAGS "/NODEFAULTLIB:libcmt" COMPILE_FLAGS "/Yustddirect3d.h" DEBUG_POSTFIX "_d" diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index bcbb36e48..c8096e189 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES}) SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Driver, Video: OpenGL") IF(WIN32) diff --git a/code/nel/src/cegui/CMakeLists.txt b/code/nel/src/cegui/CMakeLists.txt index e2572fb3e..72e138665 100644 --- a/code/nel/src/cegui/CMakeLists.txt +++ b/code/nel/src/cegui/CMakeLists.txt @@ -5,7 +5,8 @@ ADD_LIBRARY(nelceguirenderer SHARED ${SRC} nelceguirenderer.def) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY}) SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES - VERSION ${NL_VERSION} + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL CEGUI Renderer") IF(WIN32) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index c3b4ee12c..8f931d2ed 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelgeorges nelmisc) SET_TARGET_PROPERTIES(nelgeorges PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Georges") IF(WIN32) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 43d5061b7..74fbc08b1 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -10,9 +10,9 @@ ENDIF(NOT WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc) -SET_TARGET_PROPERTIES(nelligo PROPERTIES - VERSION ${NL_VERSION} - +SET_TARGET_PROPERTIES(nelligo PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Ligo") IF(WIN32) diff --git a/code/nel/src/logic/CMakeLists.txt b/code/nel/src/logic/CMakeLists.txt index 02ab5825f..ed1a389ac 100644 --- a/code/nel/src/logic/CMakeLists.txt +++ b/code/nel/src/logic/CMakeLists.txt @@ -9,7 +9,8 @@ ENDIF(NOT WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet) SET_TARGET_PROPERTIES(nellogic PROPERTIES - VERSION ${NL_VERSION} + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Logic") IF(WIN32) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 850b6a043..4691d72fa 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB}) SET_TARGET_PROPERTIES(nelmisc PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Misc") IF(WIN32) diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index 7a74e3b43..6f5493a45 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -25,8 +25,9 @@ ENDIF(WITH_GTK) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} ${NLMISC_LIB}) -SET_TARGET_PROPERTIES(nelnet PROPERTIES +SET_TARGET_PROPERTIES(nelnet PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Net") IF(WIN32) diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index aacf96673..bcfe9701f 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc) SET_TARGET_PROPERTIES(nelpacs PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL PACS") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 268ca9dc4..4d708917a 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelligo nelgeorges nel3d) SET_TARGET_PROPERTIES(nelsound PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Sound") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt index 0d0e925ae..6ac614a69 100644 --- a/code/nel/src/sound/driver/CMakeLists.txt +++ b/code/nel/src/sound/driver/CMakeLists.txt @@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${LIBXML2_LIBRARIES} nelsound) SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Library: NeL Sound Lowlevel") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/code/nel/src/sound/driver/dsound/CMakeLists.txt index 375c7dd0e..824ad990a 100644 --- a/code/nel/src/sound/driver/dsound/CMakeLists.txt +++ b/code/nel/src/sound/driver/dsound/CMakeLists.txt @@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_dsound ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY}) SET_TARGET_PROPERTIES(nel_drv_dsound PROPERTIES VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} LINK_FLAGS "/NODEFAULTLIB:libcmt" COMPILE_FLAGS "/Yustddsound.h" DEBUG_POSTFIX "_d" diff --git a/code/nel/src/sound/driver/fmod/CMakeLists.txt b/code/nel/src/sound/driver/fmod/CMakeLists.txt index 8887d03c3..5860001e9 100644 --- a/code/nel/src/sound/driver/fmod/CMakeLists.txt +++ b/code/nel/src/sound/driver/fmod/CMakeLists.txt @@ -4,8 +4,9 @@ ADD_LIBRARY(nel_drv_fmod SHARED ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FMOD_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_fmod ${LIBXML2_LIBRARIES} ${FMOD_LIBRARY} nelsnd_lowlevel) -SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES - VERSION ${NL_VERSION} +SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR} PROJECT_LABEL "Driver, Sound: FMOD") ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt index 7dbacd820..235d7d3da 100644 --- a/code/nel/src/sound/driver/openal/CMakeLists.txt +++ b/code/nel/src/sound/driver/openal/CMakeLists.txt @@ -4,7 +4,9 @@ ADD_LIBRARY(nel_drv_openal SHARED ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_openal ${LIBXML2_LIBRARIES} ${OPENAL_LIBRARY} nelsnd_lowlevel) -SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WIN32) diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt index 94d1fe8c8..558359b57 100644 --- a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt +++ b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt @@ -4,7 +4,9 @@ ADD_LIBRARY(nel_drv_xaudio2 SHARED ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(nel_drv_xaudio2 ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY} ${DXSDK_GUID_LIBRARY} ${VORBIS_LIBRARIES} ${OGG_LIBRARY}) -SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WIN32) diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index 451ae56de..a1c6261fe 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -6,8 +6,8 @@ LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp) ADD_EXECUTABLE(7zDec ${SRC}) -INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS}) IF(NOT WIN32) ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC}) @@ -16,7 +16,9 @@ ELSE(NOT WIN32) ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) -SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR}) IF(WIN32) SET_TARGET_PROPERTIES(ryzom_sevenzip diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index 2f2beb609..816f00ab5 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -17,7 +17,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SO TARGET_LINK_LIBRARIES(ryzom_gameshare ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES + VERSION ${NL_VERSION} + SOVERSION ${NL_VERSION_MAJOR}) IF(WIN32) # SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")