Merge with develop

--HG-- branch : compatibility-develop
9 years ago · 9e60db1a89
parent b9e6658562 079ea3e5c5
commit 9e60db1a89
24 changed files with 16 additions and 27 deletions
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@ -719,7 +719,6 @@ INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})

 TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
-SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nel3d "NeL, Library: NeL 3D")
 NL_ADD_RUNTIME_FLAGS(nel3d)
 NL_ADD_STATIC_VID_DRIVERS(nel3d)
--- a/code/nel/src/georges/CMakeLists.txt
+++ b/code/nel/src/georges/CMakeLists.txt
@ -8,7 +8,6 @@ NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

 TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
-SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgeorges "NeL, Library: NeL Georges")
 NL_ADD_RUNTIME_FLAGS(nelgeorges)

--- a/code/nel/src/gui/CMakeLists.txt
+++ b/code/nel/src/gui/CMakeLists.txt
@ -8,8 +8,7 @@ NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})

 INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})

-TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES})
-SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
+TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES})
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)

--- a/code/nel/src/ligo/CMakeLists.txt
+++ b/code/nel/src/ligo/CMakeLists.txt
@ -6,7 +6,6 @@ NL_TARGET_LIB(nelligo ${HEADERS} ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

 TARGET_LINK_LIBRARIES(nelligo nelmisc)
-SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelligo "NeL, Library: NeL Ligo")
 NL_ADD_RUNTIME_FLAGS(nelligo)

--- a/code/nel/src/logic/CMakeLists.txt
+++ b/code/nel/src/logic/CMakeLists.txt
@ -5,8 +5,7 @@ NL_TARGET_LIB(nellogic ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
-SET_TARGET_PROPERTIES(nellogic PROPERTIES LINK_INTERFACE_LIBRARIES "")
+TARGET_LINK_LIBRARIES(nellogic nelmisc nelnet)
 NL_DEFAULT_PROPS(nellogic "NeL, Library: NeL Logic")
 NL_ADD_RUNTIME_FLAGS(nellogic)

--- a/code/nel/src/misc/CMakeLists.txt
+++ b/code/nel/src/misc/CMakeLists.txt
@ -216,7 +216,6 @@ ENDIF(UNIX)
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)

 TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY})
-SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc")
 NL_ADD_RUNTIME_FLAGS(nelmisc)

--- a/code/nel/src/net/CMakeLists.txt
+++ b/code/nel/src/net/CMakeLists.txt
@ -13,7 +13,6 @@ IF(WITH_GTK)
 ENDIF(WITH_GTK)

 TARGET_LINK_LIBRARIES(nelnet nelmisc)
-SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelnet "NeL, Library: NeL Net")
 NL_ADD_RUNTIME_FLAGS(nelnet)

--- a/code/nel/src/pacs/CMakeLists.txt
+++ b/code/nel/src/pacs/CMakeLists.txt
@ -6,7 +6,6 @@ NL_TARGET_LIB(nelpacs ${HEADERS} ${SRC})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

 TARGET_LINK_LIBRARIES(nelpacs nelmisc)
-SET_TARGET_PROPERTIES(nelpacs PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelpacs "NeL, Library: NeL PACS")
 NL_ADD_RUNTIME_FLAGS(nelpacs)

--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@ -99,7 +99,6 @@ ENDIF(WITH_STATIC)
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

 TARGET_LINK_LIBRARIES(nelsound nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
-SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsound "NeL, Library: NeL Sound")
 NL_ADD_RUNTIME_FLAGS(nelsound)

--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@ -4,8 +4,6 @@ FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h)
 NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC})

 TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc)
-
-SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel)
 NL_ADD_STATIC_SND_DRIVERS(nelsnd_lowlevel)
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@ -30,7 +30,7 @@ NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC} ${R2})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

-TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(ryzom_gameshare "Ryzom, Library: Game Share")
 NL_ADD_RUNTIME_FLAGS(ryzom_gameshare)
 NL_ADD_LIB_SUFFIX(ryzom_gameshare)
--- a/code/ryzom/tools/assoc_mem/CMakeLists.txt
+++ b/code/ryzom/tools/assoc_mem/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(assoc_mem ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(assoc_mem ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(assoc_mem nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(assoc_mem "Ryzom, Tools, Misc: assoc_mem")
--- a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(alias_synchronizer ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(alias_synchronizer ${LIBXML2_LIBRARIES} nelmisc nelligo)
+TARGET_LINK_LIBRARIES(alias_synchronizer nelmisc nelligo)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer")
--- a/code/ryzom/tools/leveldesign/export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
@ -5,7 +5,7 @@ NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools")
 NL_ADD_RUNTIME_FLAGS(ryzom_export)
 NL_ADD_LIB_SUFFIX(ryzom_export)
--- a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(uni_conv ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(uni_conv ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(uni_conv nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool")
--- a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(land_export ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(land_export ${LIBXML2_LIBRARIES} nelmisc nelligo ryzom_landexport)
+TARGET_LINK_LIBRARIES(land_export nelmisc nelligo ryzom_landexport)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(land_export "Ryzom, Tools, World: Land Export")
--- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
@ -5,7 +5,7 @@ NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(ryzom_landexport)
 NL_ADD_LIB_SUFFIX(ryzom_landexport)
--- a/code/ryzom/tools/make_alias_file/CMakeLists.txt
+++ b/code/ryzom/tools/make_alias_file/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(make_alias_file ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(make_alias_file ${LIBXML2_LIBRARIES} nelmisc nelgeorges)
+TARGET_LINK_LIBRARIES(make_alias_file nelmisc nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File")
--- a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(make_anim_by_race ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(make_anim_by_race ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(make_anim_by_race nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race")
--- a/code/ryzom/tools/pd_parser/CMakeLists.txt
+++ b/code/ryzom/tools/pd_parser/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(pd_parser ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pd_parser ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(pd_parser nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser")
--- a/code/ryzom/tools/pdr_util/CMakeLists.txt
+++ b/code/ryzom/tools/pdr_util/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(pdr_util ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges)
+TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility")
--- a/code/ryzom/tools/skill_extractor/CMakeLists.txt
+++ b/code/ryzom/tools/skill_extractor/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(skill_extractor ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(skill_extractor ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(skill_extractor nelmisc)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor")
--- a/code/ryzom/tools/stats_scan/CMakeLists.txt
+++ b/code/ryzom/tools/stats_scan/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(stats_scan WIN32 ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare ${LIBXML2_LIBRARIES} nelmisc nelnet nelligo nelgeorges)
+TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan")
--- a/code/ryzom/tools/translation_tools/CMakeLists.txt
+++ b/code/ryzom/tools/translation_tools/CMakeLists.txt
@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(translation_tools ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(translation_tools ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges)
+TARGET_LINK_LIBRARIES(translation_tools nelmisc nelligo nelgeorges)
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

 NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools")