use namespaced target NeL::3d to be able to move towards modern cmake…

… packaging
zerotacg · Jul 4, 2024 · 58e09d0 · 58e09d0
1 parent e75ea2d
commit 58e09d0
Show file tree

Hide file tree

Showing 94 changed files with 115 additions and 111 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -419,7 +419,7 @@ IF(WITH_NEL)
   SET(NELNET_LIBRARIES nelnet)
   SET(NELLIGO_LIBRARIES nelligo)
   SET(NELGEORGES_LIBRARIES nelgeorges)
-  SET(NEL3D_LIBRARIES nel3d)
+  SET(NEL3D_LIBRARIES NeL::3d)
   SET(NELGUI_LIBRARIES nelgui)
   SET(NELSOUND_LIBRARIES nelsound)
 ELSE()

diff --git a/CMakeModules/nel.cmake b/CMakeModules/nel.cmake
@@ -29,6 +29,11 @@ MACRO(NL_TARGET_LIB name)
   ELSE()
     ADD_LIBRARY(${name} SHARED ${ARGN})
   ENDIF()
+
+  ADD_LIBRARY(${PROJECT_NAME}::${name} ALIAS ${name})
+
+  string(TOLOWER ${PROJECT_NAME} _LOWER_PROJECT_NAME)
+  set_target_properties(${name} PROPERTIES OUTPUT_NAME "${_LOWER_PROJECT_NAME}${name}")
 ENDMACRO(NL_TARGET_LIB)
 
 ###

diff --git a/nel/3rdparty/seven_zip/CMakeLists.txt b/nel/3rdparty/seven_zip/CMakeLists.txt
@@ -9,7 +9,6 @@ NL_TARGET_LIB(sevenzip ${LIB_SRC})
 NL_DEFAULT_PROPS(sevenzip "NeL, 3rd Party: Seven Zip")
 NL_ADD_RUNTIME_FLAGS(sevenzip)
 NL_ADD_LIB_SUFFIX(sevenzip)
-ADD_LIBRARY(NeL::sevenzip ALIAS sevenzip)
 set_target_properties(sevenzip PROPERTIES OUTPUT_NAME "nel_sevenzip")
 
 TARGET_COMPILE_DEFINITIONS(sevenzip PUBLIC _7ZIP_ST)

diff --git a/nel/CMakeLists.txt b/nel/CMakeLists.txt
@@ -1,3 +1,12 @@
+IF (COMMAND cmake_policy)
+  IF (POLICY CMP0048)
+    cmake_policy(SET CMP0048 NEW)
+  ENDIF ()
+ENDIF ()
+
+project(NeL VERSION ${RyzomCore_VERSION} LANGUAGES CXX C)
+
+
 IF(WITH_STATIC_DRIVERS)
   ADD_DEFINITIONS(-DNL_STATIC)
 ENDIF()
@@ -75,14 +84,6 @@ ADD_SUBDIRECTORY(tools)
 
 
 # packaging
-IF (COMMAND cmake_policy)
-  IF (POLICY CMP0048)
-    cmake_policy(SET CMP0048 NEW)
-  ENDIF ()
-ENDIF ()
-
-project(NeL VERSION ${RyzomCore_VERSION} LANGUAGES CXX C)
-
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
@@ -91,11 +92,10 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
 set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(package_components "sevenzip misc")
 
 set(targets_export_name "${PROJECT_NAME}-targets")
 
-install(TARGETS misc sevenzip
+install(TARGETS 3d misc sevenzip
         COMPONENT libraries
         EXPORT "${targets_export_name}"
         FILE_SET HEADERS

diff --git a/nel/samples/3d/cegui/CMakeLists.txt b/nel/samples/3d/cegui/CMakeLists.txt
@@ -6,7 +6,7 @@ TARGET_COMPILE_DEFINITIONS(nl_sample_cegui PRIVATE "CEGUI_DATA_DIR=\"${NL_SHARE_
 
 INCLUDE_DIRECTORIES(${CEGUI_INCLUDE_DIRS})
 
-TARGET_LINK_LIBRARIES(nl_sample_cegui ${CEGUI_LIBRARY} NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_cegui ${CEGUI_LIBRARY} NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(nl_sample_cegui "NeL, Samples, 3D: NeL CEGUI Demo")
 NL_ADD_RUNTIME_FLAGS(nl_sample_cegui)
 

diff --git a/nel/samples/3d/cluster_viewer/CMakeLists.txt b/nel/samples/3d/cluster_viewer/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_clusterview WIN32 ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_clusterview PRIVATE "CV_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_clusterview/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_clusterview NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_clusterview NeL::misc NeL::3d)
 NL_ADD_RUNTIME_FLAGS(nl_sample_clusterview)
 NL_DEFAULT_PROPS(nl_sample_clusterview "NeL, Samples, 3D: Cluster Viewer")
 

diff --git a/nel/samples/3d/font/CMakeLists.txt b/nel/samples/3d/font/CMakeLists.txt
@@ -4,8 +4,8 @@ ADD_EXECUTABLE(nl_sample_font WIN32 ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_font PRIVATE "FONT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font/\"")
 
-# TODO: hunter TARGET_LINK_LIBRARIES(nl_sample_font PRIVATE NeL::misc nel3d)
-TARGET_LINK_LIBRARIES(nl_sample_font NeL::misc nel3d)
+# TODO: hunter TARGET_LINK_LIBRARIES(nl_sample_font PRIVATE NeL::misc NeL::3d)
+TARGET_LINK_LIBRARIES(nl_sample_font NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(nl_sample_font "NeL, Samples, 3D: Font")
 NL_ADD_RUNTIME_FLAGS(nl_sample_font)
 

diff --git a/nel/samples/3d/font_perf/CMakeLists.txt b/nel/samples/3d/font_perf/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_font_perf ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_font_perf PRIVATE "FONT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font_perf/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_font_perf NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_font_perf NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(nl_sample_font_perf "NeL, Samples, 3D: Font Performance Test")
 NL_ADD_RUNTIME_FLAGS(nl_sample_font_perf)
 

diff --git a/nel/samples/3d/qtnel/CMakeLists.txt b/nel/samples/3d/qtnel/CMakeLists.txt
@@ -21,7 +21,7 @@ ADD_EXECUTABLE(qtnel WIN32 ${QTNEL_SRC} ${QTNEL_MOC_SRCS} ${QTNEL_HDR})
 
 INCLUDE_DIRECTORIES(${QT_INCLUDES})
 
-TARGET_LINK_LIBRARIES(qtnel ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(qtnel ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(qtnel "Samples, 3D: Qt Viewer Widget")
 NL_ADD_RUNTIME_FLAGS(qtnel)
 

diff --git a/nel/samples/3d/shape_viewer/CMakeLists.txt b/nel/samples/3d/shape_viewer/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_shapeview WIN32 ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_shapeview NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_shapeview NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(nl_sample_shapeview "NeL, Samples, 3D: Shape Viewer")
 NL_ADD_RUNTIME_FLAGS(nl_sample_shapeview)
 

diff --git a/nel/samples/net/udp/CMakeLists.txt b/nel/samples/net/udp/CMakeLists.txt
@@ -13,7 +13,7 @@ TARGET_LINK_LIBRARIES(nl_sample_udpserver NeL::misc nelnet)
 
 IF(WITH_3D)
   ADD_DEFINITIONS(-DUSE_3D)
-  TARGET_LINK_LIBRARIES(nl_sample_udpclient nel3d)
+  TARGET_LINK_LIBRARIES(nl_sample_udpclient NeL::3d)
 ENDIF()
 
 NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client")

diff --git a/nel/samples/pacs/CMakeLists.txt b/nel/samples/pacs/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_pacs WIN32 ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_pacs PRIVATE "NL_PACS_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_pacs NeL::misc nelpacs nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_pacs NeL::misc nelpacs NeL::3d)
 NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
 NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
 

diff --git a/nel/src/3d/CMakeLists.txt b/nel/src/3d/CMakeLists.txt
@@ -713,29 +713,29 @@ SOURCE_GROUP(Stereo FILES
 		stereo_debugger.cpp
 		../../include/nel/3d/stereo_debugger.h)
 
-NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
+NL_TARGET_LIB(3d ${HEADERS} ${SRC})
 
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${LIBVR_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nel3d NeL::misc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
-NL_DEFAULT_PROPS(nel3d "NeL, Library: NeL 3D")
-NL_ADD_RUNTIME_FLAGS(nel3d)
-NL_ADD_STATIC_VID_DRIVERS(nel3d)
+TARGET_LINK_LIBRARIES(3d NeL::misc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
+NL_DEFAULT_PROPS(3d "NeL, Library: NeL 3D")
+NL_ADD_RUNTIME_FLAGS(3d)
+NL_ADD_STATIC_VID_DRIVERS(3d)
 
-NL_ADD_LIB_SUFFIX(nel3d)
+NL_ADD_LIB_SUFFIX(3d)
 
 ADD_DEFINITIONS(${LIBOVR_DEFINITIONS})
 ADD_DEFINITIONS(${LIBVR_DEFINITIONS})
 
 IF(WITH_PCH)
-  target_precompile_headers(nel3d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/std3d.h)
+  target_precompile_headers(3d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/std3d.h)
 ENDIF()
 
 NL_GEN_PC(nel-3d.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
-  INSTALL(TARGETS nel3d LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
+  INSTALL(TARGETS 3d LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 ENDIF()
 
 ADD_SUBDIRECTORY(driver)
diff --git a/nel/src/3d/driver/direct3d/CMakeLists.txt b/nel/src/3d/driver/direct3d/CMakeLists.txt
@@ -4,7 +4,7 @@ NL_TARGET_DRIVER(nel_drv_direct3d_win ${SRC})
 
 INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d NeL::misc ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY})
+TARGET_LINK_LIBRARIES(nel_drv_direct3d_win NeL::3d NeL::misc ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY})
 
 NL_DEFAULT_PROPS(nel_drv_direct3d_win "NeL, Driver, Video: Direct3D")
 NL_ADD_RUNTIME_FLAGS(nel_drv_direct3d_win)

diff --git a/nel/src/3d/driver/opengl/CMakeLists.txt b/nel/src/3d/driver/opengl/CMakeLists.txt
@@ -43,7 +43,7 @@ NL_TARGET_DRIVER(${NLDRV_OGL_LIB} ${SRC})
 
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d NeL::misc ${OPENGL_gl_LIBRARY})
+TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} NeL::3d NeL::misc ${OPENGL_gl_LIBRARY})
 NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "NeL, Driver, Video: OpenGL")
 NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB})
 NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB})

diff --git a/nel/src/3d/driver/opengles/CMakeLists.txt b/nel/src/3d/driver/opengles/CMakeLists.txt
@@ -32,7 +32,7 @@ ENDIF()
 
 NL_TARGET_DRIVER(${NLDRV_OGLES_LIB} ${SRC})
 
-TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} nel3d NeL::misc ${OPENGLES_LIBRARIES})
+TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} NeL::3d NeL::misc ${OPENGLES_LIBRARIES})
 NL_DEFAULT_PROPS(${NLDRV_OGLES_LIB} "NeL, Driver, Video: OpenGL ES")
 NL_ADD_LIB_SUFFIX(${NLDRV_OGLES_LIB})
 NL_ADD_RUNTIME_FLAGS(${NLDRV_OGLES_LIB})

diff --git a/nel/src/cegui/CMakeLists.txt b/nel/src/cegui/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_LIBRARY(nelceguirenderer SHARED ${HEADERS} ${SRC} nelceguirenderer.def)
 
 INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CEGUI_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(nelceguirenderer NeL::misc nel3d ${CEGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(nelceguirenderer NeL::misc NeL::3d ${CEGUI_LIBRARY})
 NL_DEFAULT_PROPS(nelceguirenderer "NeL, Library: CEGUI Renderer")
 NL_ADD_RUNTIME_FLAGS(nelceguirenderer)
 NL_ADD_LIB_SUFFIX(nelceguirenderer)

diff --git a/nel/src/gui/CMakeLists.txt b/nel/src/gui/CMakeLists.txt
@@ -7,7 +7,7 @@ NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
 
-TARGET_LINK_LIBRARIES(nelgui NeL::misc nelweb nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES})
+TARGET_LINK_LIBRARIES(nelgui NeL::misc nelweb NeL::3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES})
 
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)

diff --git a/nel/src/sound/CMakeLists.txt b/nel/src/sound/CMakeLists.txt
@@ -128,7 +128,7 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nelsound NeL::misc nelligo nelgeorges nel3d nelsnd_lowlevel)
+TARGET_LINK_LIBRARIES(nelsound NeL::misc nelligo nelgeorges NeL::3d nelsnd_lowlevel)
 NL_DEFAULT_PROPS(nelsound "NeL, Library: NeL Sound")
 NL_ADD_RUNTIME_FLAGS(nelsound)
 

diff --git a/nel/tools/3d/anim_builder/CMakeLists.txt b/nel/tools/3d/anim_builder/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(anim_builder ${SRC})
 
-TARGET_LINK_LIBRARIES(anim_builder NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(anim_builder NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(anim_builder "NeL, Tools, 3D: anim_builder")
 NL_ADD_RUNTIME_FLAGS(anim_builder)
 

diff --git a/nel/tools/3d/animation_set_builder/CMakeLists.txt b/nel/tools/3d/animation_set_builder/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(animation_set_builder ${SRC})
 
-TARGET_LINK_LIBRARIES(animation_set_builder nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(animation_set_builder NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: Animation Set Builder")
 NL_ADD_RUNTIME_FLAGS(animation_set_builder)
 

diff --git a/nel/tools/3d/build_clod_bank/CMakeLists.txt b/nel/tools/3d/build_clod_bank/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 
-TARGET_LINK_LIBRARIES(build_clod_bank nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(build_clod_bank NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(build_clod_bank "NeL, Tools, 3D: build_clod_bank")
 NL_ADD_RUNTIME_FLAGS(build_clod_bank)
 

diff --git a/nel/tools/3d/build_clodtex/CMakeLists.txt b/nel/tools/3d/build_clodtex/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_clodtex ${SRC})
 
-TARGET_LINK_LIBRARIES(build_clodtex nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(build_clodtex NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(build_clodtex "NeL, Tools, 3D: build_clodtex")
 NL_ADD_RUNTIME_FLAGS(build_clodtex)
 

diff --git a/nel/tools/3d/build_coarse_mesh/CMakeLists.txt b/nel/tools/3d/build_coarse_mesh/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 
-TARGET_LINK_LIBRARIES(build_coarse_mesh nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(build_coarse_mesh NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(build_coarse_mesh "NeL, Tools, 3D: build_coarse_mesh")
 NL_ADD_RUNTIME_FLAGS(build_coarse_mesh)
 

diff --git a/nel/tools/3d/build_far_bank/CMakeLists.txt b/nel/tools/3d/build_far_bank/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_far_bank ${SRC})
 
-TARGET_LINK_LIBRARIES(build_far_bank nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(build_far_bank NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(build_far_bank "NeL, Tools, 3D: build_far_bank")
 NL_ADD_RUNTIME_FLAGS(build_far_bank)
 

diff --git a/nel/tools/3d/build_shadow_skin/CMakeLists.txt b/nel/tools/3d/build_shadow_skin/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 
-TARGET_LINK_LIBRARIES(build_shadow_skin NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(build_shadow_skin NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(build_shadow_skin "NeL, Tools, 3D: build_shadow_skin")
 NL_ADD_RUNTIME_FLAGS(build_shadow_skin)
 

diff --git a/nel/tools/3d/build_smallbank/CMakeLists.txt b/nel/tools/3d/build_smallbank/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(build_smallbank ${SRC})
 
-TARGET_LINK_LIBRARIES(build_smallbank nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(build_smallbank NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(build_smallbank "NeL, Tools, 3D: build_smallbank")
 NL_ADD_RUNTIME_FLAGS(build_smallbank)
 

diff --git a/nel/tools/3d/cluster_viewer/CMakeLists.txt b/nel/tools/3d/cluster_viewer/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC})
 
-TARGET_LINK_LIBRARIES(cluster_viewer nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(cluster_viewer NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(cluster_viewer "NeL, Tools, 3D: Cluster Viewer")
 NL_ADD_RUNTIME_FLAGS(cluster_viewer)
 

diff --git a/nel/tools/3d/file_info/CMakeLists.txt b/nel/tools/3d/file_info/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(file_info ${SRC})
 
-TARGET_LINK_LIBRARIES(file_info nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(file_info NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(file_info "NeL, Tools, 3D: file_info")
 NL_ADD_RUNTIME_FLAGS(file_info)
 

diff --git a/nel/tools/3d/hls_bank_maker/CMakeLists.txt b/nel/tools/3d/hls_bank_maker/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(hls_bank_maker ${SRC})
 
-TARGET_LINK_LIBRARIES(hls_bank_maker s3tc_compressor NeL::misc nel3d)
+TARGET_LINK_LIBRARIES(hls_bank_maker s3tc_compressor NeL::misc NeL::3d)
 NL_DEFAULT_PROPS(hls_bank_maker "NeL, Tools, 3D: hls_bank_maker")
 NL_ADD_RUNTIME_FLAGS(hls_bank_maker)
 

diff --git a/nel/tools/3d/ig_add/CMakeLists.txt b/nel/tools/3d/ig_add/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_add ${SRC})
 
-TARGET_LINK_LIBRARIES(ig_add nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(ig_add NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(ig_add "NeL, Tools, 3D: ig_add")
 NL_ADD_RUNTIME_FLAGS(ig_add)
 

diff --git a/nel/tools/3d/ig_elevation/CMakeLists.txt b/nel/tools/3d/ig_elevation/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
-TARGET_LINK_LIBRARIES(ig_elevation NeL::misc nel3d nelligo)
+TARGET_LINK_LIBRARIES(ig_elevation NeL::misc NeL::3d nelligo)
 NL_DEFAULT_PROPS(ig_elevation "NeL, Tools, 3D: IG Elevation")
 NL_ADD_RUNTIME_FLAGS(ig_elevation)
 

diff --git a/nel/tools/3d/ig_info/CMakeLists.txt b/nel/tools/3d/ig_info/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_info ${SRC})
 
-TARGET_LINK_LIBRARIES(ig_info nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(ig_info NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(ig_info "NeL, Tools, 3D: ig_info")
 NL_ADD_RUNTIME_FLAGS(ig_info)
 

diff --git a/nel/tools/3d/ig_lighter/CMakeLists.txt b/nel/tools/3d/ig_lighter/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(ig_lighter ${SRC})
 
-TARGET_LINK_LIBRARIES(ig_lighter NeL::misc nel3d nelpacs)
+TARGET_LINK_LIBRARIES(ig_lighter NeL::misc NeL::3d nelpacs)
 NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter")
 NL_ADD_RUNTIME_FLAGS(ig_lighter)
 

diff --git a/nel/tools/3d/lightmap_optimizer/CMakeLists.txt b/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
@@ -4,7 +4,7 @@ SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(lightmap_optimizer ${SRC})
 
-TARGET_LINK_LIBRARIES(lightmap_optimizer nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(lightmap_optimizer NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(lightmap_optimizer "NeL, Tools, 3D: lightmap_optimizer")
 NL_ADD_RUNTIME_FLAGS(lightmap_optimizer)
 

diff --git a/nel/tools/3d/ligo/plugin_max/CMakeLists.txt b/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(ligoscape_utility
 							NeL::misc
 							nelligo
-							nel3d
+							NeL::3d
 							nelpacs
 							${MAXSDK_LIBRARIES}
 							nel_patch_lib

diff --git a/nel/tools/3d/mesh_export/CMakeLists.txt b/nel/tools/3d/mesh_export/CMakeLists.txt
@@ -6,7 +6,7 @@ SOURCE_GROUP("" FILES ${SRCS} ${HDRS} ${RECS})
 
 ADD_EXECUTABLE(mesh_export ${SRCS} ${HDRS} ${RECS})
 
-TARGET_LINK_LIBRARIES(mesh_export mesh_utils nel3d NeL::misc)
+TARGET_LINK_LIBRARIES(mesh_export mesh_utils NeL::3d NeL::misc)
 NL_DEFAULT_PROPS(mesh_export "NeL, Tools, 3D: Mesh Export")
 NL_ADD_RUNTIME_FLAGS(mesh_export)