mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-22 23:06:18 +00:00
Changed: #842 Added SOVERSION property to shared libraries
This commit is contained in:
parent
46707ef3bc
commit
f52b581031
18 changed files with 36 additions and 15 deletions
|
@ -674,6 +674,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLU
|
||||||
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
|
TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
|
||||||
SET_TARGET_PROPERTIES(nel3d PROPERTIES
|
SET_TARGET_PROPERTIES(nel3d PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL 3D")
|
PROJECT_LABEL "Library: NeL 3D")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -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})
|
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
|
SET_TARGET_PROPERTIES(nel_drv_direct3d_win PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
LINK_FLAGS "/NODEFAULTLIB:libcmt"
|
LINK_FLAGS "/NODEFAULTLIB:libcmt"
|
||||||
COMPILE_FLAGS "/Yustddirect3d.h"
|
COMPILE_FLAGS "/Yustddirect3d.h"
|
||||||
DEBUG_POSTFIX "_d"
|
DEBUG_POSTFIX "_d"
|
||||||
|
|
|
@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})
|
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_LIBRARIES})
|
||||||
SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES
|
SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Driver, Video: OpenGL")
|
PROJECT_LABEL "Driver, Video: OpenGL")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -5,7 +5,8 @@ ADD_LIBRARY(nelceguirenderer SHARED ${SRC} nelceguirenderer.def)
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS})
|
||||||
TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
|
TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY})
|
||||||
SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES
|
SET_TARGET_PROPERTIES(nelceguirenderer PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL CEGUI Renderer")
|
PROJECT_LABEL "Library: NeL CEGUI Renderer")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
|
TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
|
||||||
SET_TARGET_PROPERTIES(nelgeorges PROPERTIES
|
SET_TARGET_PROPERTIES(nelgeorges PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Georges")
|
PROJECT_LABEL "Library: NeL Georges")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -10,9 +10,9 @@ ENDIF(NOT WIN32)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
|
TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
|
||||||
SET_TARGET_PROPERTIES(nelligo PROPERTIES
|
SET_TARGET_PROPERTIES(nelligo PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Ligo")
|
PROJECT_LABEL "Library: NeL Ligo")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -9,7 +9,8 @@ ENDIF(NOT WIN32)
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
|
TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
|
||||||
SET_TARGET_PROPERTIES(nellogic PROPERTIES
|
SET_TARGET_PROPERTIES(nellogic PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Logic")
|
PROJECT_LABEL "Library: NeL Logic")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
|
||||||
TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB})
|
TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB})
|
||||||
SET_TARGET_PROPERTIES(nelmisc PROPERTIES
|
SET_TARGET_PROPERTIES(nelmisc PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Misc")
|
PROJECT_LABEL "Library: NeL Misc")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -25,8 +25,9 @@ ENDIF(WITH_GTK)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} ${NLMISC_LIB})
|
TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} ${NLMISC_LIB})
|
||||||
SET_TARGET_PROPERTIES(nelnet PROPERTIES
|
SET_TARGET_PROPERTIES(nelnet PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Net")
|
PROJECT_LABEL "Library: NeL Net")
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc)
|
TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc)
|
||||||
SET_TARGET_PROPERTIES(nelpacs PROPERTIES
|
SET_TARGET_PROPERTIES(nelpacs PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL PACS")
|
PROJECT_LABEL "Library: NeL PACS")
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelligo nelgeorges nel3d)
|
TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelligo nelgeorges nel3d)
|
||||||
SET_TARGET_PROPERTIES(nelsound PROPERTIES
|
SET_TARGET_PROPERTIES(nelsound PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Sound")
|
PROJECT_LABEL "Library: NeL Sound")
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${LIBXML2_LIBRARIES} nelsound)
|
TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${LIBXML2_LIBRARIES} nelsound)
|
||||||
SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES
|
SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Library: NeL Sound Lowlevel")
|
PROJECT_LABEL "Library: NeL Sound Lowlevel")
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -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})
|
TARGET_LINK_LIBRARIES(nel_drv_dsound ${LIBXML2_LIBRARIES} nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY})
|
||||||
SET_TARGET_PROPERTIES(nel_drv_dsound PROPERTIES
|
SET_TARGET_PROPERTIES(nel_drv_dsound PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
LINK_FLAGS "/NODEFAULTLIB:libcmt"
|
LINK_FLAGS "/NODEFAULTLIB:libcmt"
|
||||||
COMPILE_FLAGS "/Yustddsound.h"
|
COMPILE_FLAGS "/Yustddsound.h"
|
||||||
DEBUG_POSTFIX "_d"
|
DEBUG_POSTFIX "_d"
|
||||||
|
|
|
@ -4,8 +4,9 @@ ADD_LIBRARY(nel_drv_fmod SHARED ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FMOD_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FMOD_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nel_drv_fmod ${LIBXML2_LIBRARIES} ${FMOD_LIBRARY} nelsnd_lowlevel)
|
TARGET_LINK_LIBRARIES(nel_drv_fmod ${LIBXML2_LIBRARIES} ${FMOD_LIBRARY} nelsnd_lowlevel)
|
||||||
SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES
|
SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES
|
||||||
VERSION ${NL_VERSION}
|
VERSION ${NL_VERSION}
|
||||||
|
SOVERSION ${NL_VERSION_MAJOR}
|
||||||
PROJECT_LABEL "Driver, Sound: FMOD")
|
PROJECT_LABEL "Driver, Sound: FMOD")
|
||||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,9 @@ ADD_LIBRARY(nel_drv_openal SHARED ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(nel_drv_openal ${LIBXML2_LIBRARIES} ${OPENAL_LIBRARY} nelsnd_lowlevel)
|
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})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -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})
|
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})
|
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})
|
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -6,8 +6,8 @@ LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(7zDec ${SRC})
|
ADD_EXECUTABLE(7zDec ${SRC})
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY})
|
TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS})
|
||||||
|
|
||||||
IF(NOT WIN32)
|
IF(NOT WIN32)
|
||||||
ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC})
|
ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC})
|
||||||
|
@ -16,7 +16,9 @@ ELSE(NOT WIN32)
|
||||||
ENDIF(NOT WIN32)
|
ENDIF(NOT WIN32)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS})
|
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)
|
IF(WIN32)
|
||||||
SET_TARGET_PROPERTIES(ryzom_sevenzip
|
SET_TARGET_PROPERTIES(ryzom_sevenzip
|
||||||
|
|
|
@ -17,7 +17,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SO
|
||||||
TARGET_LINK_LIBRARIES(ryzom_gameshare
|
TARGET_LINK_LIBRARIES(ryzom_gameshare
|
||||||
${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}
|
${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}
|
||||||
${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
|
${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)
|
IF(WIN32)
|
||||||
# SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
|
# SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
|
||||||
|
|
Loading…
Reference in a new issue