adjust target namespace to NeL according to package name

prepare snowballs preset
zerotacg · Jul 3, 2024 · 4f49bd7 · 4f49bd7
1 parent e91001e
commit 4f49bd7
Show file tree

Hide file tree

Showing 242 changed files with 369 additions and 276 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,10 @@ IF(COMMAND cmake_policy)
   IF(POLICY CMP0020)
     CMAKE_POLICY(SET CMP0020 NEW)
   ENDIF()
+
+  IF (POLICY CMP0048)
+    cmake_policy(SET CMP0048 NEW)
+  ENDIF ()
 ENDIF()
 
 
@@ -81,11 +85,11 @@ ELSE()
   SET(CURRENT_YEAR "2019")
 ENDIF()
 
-PROJECT(RyzomCore CXX C)
-SET(NL_VERSION_MAJOR 4)
-SET(NL_VERSION_MINOR 1)
-SET(NL_VERSION_PATCH 0 CACHE STRING "Patch version")
-SET(NL_VERSION_BUILD 0 CACHE STRING "Build number")
+PROJECT(RyzomCore VERSION 4.1.0.0 LANGUAGES CXX C)
+SET(NL_VERSION_MAJOR ${RyzomCore_VERSION_MAJOR})
+SET(NL_VERSION_MINOR ${RyzomCore_VERSION_MINOR})
+SET(NL_VERSION_PATCH ${RyzomCore_VERSION_PATCH} CACHE STRING "Patch version")
+SET(NL_VERSION_BUILD ${RyzomCore_VERSION_TWEAK} CACHE STRING "Build number")
 SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 
@@ -411,7 +415,7 @@ IF(WITH_NEL)
   ADD_SUBDIRECTORY(nel)
 
   # Aliases for targets
-  SET(NELMISC_LIBRARIES nel::misc)
+  SET(NELMISC_LIBRARIES NeL::misc)
   SET(NELNET_LIBRARIES nelnet)
   SET(NELLIGO_LIBRARIES nelligo)
   SET(NELGEORGES_LIBRARIES nelgeorges)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -2,6 +2,7 @@
   "version": 6,
   "include": [
     "cmake/CMakePresets.base.json",
-    "cmake/CMakePresets.nel.json"
+    "cmake/CMakePresets.nel.json",
+    "cmake/CMakePresets.snowballs.json"
   ]
 }
diff --git a/cmake/CMakePresets.snowballs.json b/cmake/CMakePresets.snowballs.json
@@ -0,0 +1,62 @@
+{
+  "version": 6,
+  "include": [
+    "CMakePresets.base.json",
+    "CMakePresets.os.json"
+  ],
+  "configurePresets": [
+    {
+      "inherits": "default",
+      "binaryDir": "${sourceDir}/build/snowballs",
+      "name": "snowballs",
+      "cacheVariables": {
+        "WITH_SNOWBALLS": true,
+        "WITH_NEL": false,
+        "WITH_NELNS": false,
+        "WITH_LUA51": false,
+        "WITH_LUA52": true,
+        "WITH_RYZOM": false,
+        "WITH_STUDIO": false,
+        "WITH_TOOLS": false,
+        "WITH_QT5": true,
+        "WITH_LIBGSF": true,
+        "CPACK_PACKAGE_NAME": "snowballs",
+        "CMAKE_PREFIX_PATH": "${sourceDir}/build/install"
+      }
+    },
+    {
+      "inherits": [
+        "linux",
+        "snowballs"
+      ],
+      "name": "linux-snowballs"
+    },
+    {
+      "inherits": [
+        "windows",
+        "snowballs"
+      ],
+      "name": "windows-snowballs"
+    }
+  ],
+  "buildPresets": [
+    {
+      "inherits": "release",
+      "name": "snowballs",
+      "configurePreset": "snowballs"
+    }
+  ],
+  "testPresets": [
+    {
+      "inherits": "default",
+      "name": "snowballs",
+      "configurePreset": "snowballs"
+    }
+  ],
+  "packagePresets": [
+    {
+      "name": "snowballs",
+      "configurePreset": "snowballs"
+    }
+  ]
+}
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
@@ -0,0 +1,12 @@
+@PACKAGE_INIT@
+
+set(_@PROJECT_NAME@_supported_components @package_components@)
+
+foreach(_comp ${@PROJECT_NAME@_FIND_COMPONENTS})
+  if (NOT _comp IN_LIST _@PROJECT_NAME@_supported_components)
+    set(@PROJECT_NAME@_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-${_comp}-targets.cmake")
+endforeach()
+
+check_required_components(@PROJECT_NAME@)
diff --git a/nel/3rdparty/seven_zip/CMakeLists.txt b/nel/3rdparty/seven_zip/CMakeLists.txt
@@ -4,23 +4,24 @@ FILE(GLOB LIB_SRC *.cpp *.c *.h)
 
 LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/LzmaUtil.c)
 
-NL_TARGET_LIB(nel_sevenzip ${LIB_SRC})
+NL_TARGET_LIB(sevenzip ${LIB_SRC})
 # TARGET_LINK_LIBRARIES(nel_sevenzip ${PLATFORM_LINKFLAGS})
-NL_DEFAULT_PROPS(nel_sevenzip "NeL, 3rd Party: Seven Zip")
-NL_ADD_RUNTIME_FLAGS(nel_sevenzip)
-NL_ADD_LIB_SUFFIX(nel_sevenzip)
-ADD_LIBRARY(nel::sevenzip ALIAS nel_sevenzip)
+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(nel_sevenzip PUBLIC _7ZIP_ST)
+TARGET_COMPILE_DEFINITIONS(sevenzip PUBLIC _7ZIP_ST)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
-  INSTALL(TARGETS nel_sevenzip LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
+  INSTALL(TARGETS sevenzip LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 ENDIF()
 
 IF(WITH_NEL_TOOLS)
   ADD_EXECUTABLE(nellzma ${CMAKE_CURRENT_SOURCE_DIR}/LzmaUtil.c)
 
-  TARGET_LINK_LIBRARIES(nellzma nel::sevenzip)
+  TARGET_LINK_LIBRARIES(nellzma NeL::sevenzip)
   NL_DEFAULT_PROPS(nellzma "NeL, 3rd Party: LZMA")
   NL_ADD_RUNTIME_FLAGS(nellzma)
 

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 nel3d)
 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 nel3d)
 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 nel3d)
+TARGET_LINK_LIBRARIES(nl_sample_font NeL::misc nel3d)
 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 nel3d)
 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 nel3d)
 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 nel3d)
 NL_DEFAULT_PROPS(nl_sample_shapeview "NeL, Samples, 3D: Shape Viewer")
 NL_ADD_RUNTIME_FLAGS(nl_sample_shapeview)
 

diff --git a/nel/samples/georges/CMakeLists.txt b/nel/samples/georges/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_georges ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_georges PRIVATE "GF_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges")
 NL_ADD_RUNTIME_FLAGS(nl_sample_georges)
 

diff --git a/nel/samples/misc/callback/CMakeLists.txt b/nel/samples/misc/callback/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_callback ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_callback nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_callback NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_callback "NeL, Samples, Misc: Callback")
 NL_ADD_RUNTIME_FLAGS(nl_sample_callback)
 

diff --git a/nel/samples/misc/command/CMakeLists.txt b/nel/samples/misc/command/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_command ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_command nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_command NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_command "NeL, Samples, Misc: Commands")
 NL_ADD_RUNTIME_FLAGS(nl_sample_command)
 

diff --git a/nel/samples/misc/configfile/CMakeLists.txt b/nel/samples/misc/configfile/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_configfile ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_configfile PRIVATE "NL_SAMPLE_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_configfile nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_configfile NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files")
 NL_ADD_RUNTIME_FLAGS(nl_sample_configfile)
 

diff --git a/nel/samples/misc/debug/CMakeLists.txt b/nel/samples/misc/debug/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_debug ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_debug nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_debug NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_debug "NeL, Samples, Misc: Debugging")
 NL_ADD_RUNTIME_FLAGS(nl_sample_debug)
 

diff --git a/nel/samples/misc/i18n/CMakeLists.txt b/nel/samples/misc/i18n/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_i18n ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_i18n PRIVATE "NL_LANG_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_i18n nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_i18n NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N")
 NL_ADD_RUNTIME_FLAGS(nl_sample_i18n)
 

diff --git a/nel/samples/misc/log/CMakeLists.txt b/nel/samples/misc/log/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_log ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_log nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_log NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_log "NeL, Samples, Misc: Logging")
 NL_ADD_RUNTIME_FLAGS(nl_sample_log)
 

diff --git a/nel/samples/misc/strings/CMakeLists.txt b/nel/samples/misc/strings/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_strings ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_strings nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_strings NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_strings "NeL, Samples, Misc: Strings")
 NL_ADD_RUNTIME_FLAGS(nl_sample_strings)
 

diff --git a/nel/samples/misc/types_check/CMakeLists.txt b/nel/samples/misc/types_check/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(nl_sample_types_check ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_types_check nel::misc)
+TARGET_LINK_LIBRARIES(nl_sample_types_check NeL::misc)
 NL_DEFAULT_PROPS(nl_sample_types_check "Samples, MISC: Types check sample")
 NL_ADD_RUNTIME_FLAGS(nl_sample_types_check)
 

diff --git a/nel/samples/net/chat/CMakeLists.txt b/nel/samples/net/chat/CMakeLists.txt
@@ -6,11 +6,11 @@ SET(CHAT_DIR "CHAT_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_chat/\"")
 TARGET_COMPILE_DEFINITIONS(nl_sample_chatclient PRIVATE ${CHAT_DIR})
 TARGET_COMPILE_DEFINITIONS(nl_sample_chatserver PRIVATE ${CHAT_DIR})
 
-TARGET_LINK_LIBRARIES(nl_sample_chatclient nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_chatclient NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_chatclient "NeL, Samples, Net, Chat: Chat Client")
 NL_ADD_RUNTIME_FLAGS(nl_sample_chatclient)
 
-TARGET_LINK_LIBRARIES(nl_sample_chatserver nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_chatserver NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_chatserver "NeL, Samples, Net, Chat: Chat Server")
 NL_ADD_RUNTIME_FLAGS(nl_sample_chatserver)
 

diff --git a/nel/samples/net/class_transport/CMakeLists.txt b/nel/samples/net/class_transport/CMakeLists.txt
@@ -6,11 +6,11 @@ SET(NL_CT_CFG "NL_CT_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_class_transport
 TARGET_COMPILE_DEFINITIONS(nl_sample_ct_ai_service PRIVATE ${NL_CT_CFG})
 TARGET_COMPILE_DEFINITIONS(nl_sample_ct_gd_service PRIVATE ${NL_CT_CFG})
 
-TARGET_LINK_LIBRARIES(nl_sample_ct_ai_service nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_ct_ai_service NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ct_ai_service "NeL, Samples, Net, Class Transport: AI Service")
 NL_ADD_RUNTIME_FLAGS(nl_sample_ct_ai_service)
 
-TARGET_LINK_LIBRARIES(nl_sample_ct_gd_service nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_ct_gd_service NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ct_gd_service "NeL, Samples, Net, Class Transport: GD Service")
 NL_ADD_RUNTIME_FLAGS(nl_sample_ct_gd_service)
 

diff --git a/nel/samples/net/login_system/CMakeLists.txt b/nel/samples/net/login_system/CMakeLists.txt
@@ -6,11 +6,11 @@ SET(NL_LS_CFG "NL_LS_CFG=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_login_system/\"
 TARGET_COMPILE_DEFINITIONS(nl_sample_ls_client PRIVATE ${NL_LS_CFG})
 TARGET_COMPILE_DEFINITIONS(nl_sample_ls_fes PRIVATE ${NL_LS_CFG})
 
-TARGET_LINK_LIBRARIES(nl_sample_ls_client nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_ls_client NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ls_client "NeL, Samples, Net, Login Service: LS Client")
 NL_ADD_RUNTIME_FLAGS(nl_sample_ls_client)
 
-TARGET_LINK_LIBRARIES(nl_sample_ls_fes nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_ls_fes NeL::misc nelnet)
 NL_DEFAULT_PROPS(nl_sample_ls_fes "NeL, Samples, Net, Login Service: LS Frontend")
 NL_ADD_RUNTIME_FLAGS(nl_sample_ls_fes)
 

diff --git a/nel/samples/net/udp/CMakeLists.txt b/nel/samples/net/udp/CMakeLists.txt
@@ -8,8 +8,8 @@ SET(UDP_DIR "UDP_DIR=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\"")
 TARGET_COMPILE_DEFINITIONS(nl_sample_udpclient PRIVATE ${UDP_DIR})
 TARGET_COMPILE_DEFINITIONS(nl_sample_udpserver PRIVATE ${UDP_DIR})
 
-TARGET_LINK_LIBRARIES(nl_sample_udpclient nel::misc nelnet)
-TARGET_LINK_LIBRARIES(nl_sample_udpserver nel::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_udpclient NeL::misc nelnet)
+TARGET_LINK_LIBRARIES(nl_sample_udpserver NeL::misc nelnet)
 
 IF(WITH_3D)
   ADD_DEFINITIONS(-DUSE_3D)

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 nel3d)
 NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
 NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
 

diff --git a/nel/samples/sound/sound_sources/CMakeLists.txt b/nel/samples/sound/sound_sources/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_EXECUTABLE(nl_sample_sound_sources ${SRC})
 
 TARGET_COMPILE_DEFINITIONS(nl_sample_sound_sources PRIVATE "NL_SOUND_DATA=\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_sound/\"")
 
-TARGET_LINK_LIBRARIES(nl_sample_sound_sources nel::misc nelsound)
+TARGET_LINK_LIBRARIES(nl_sample_sound_sources NeL::misc nelsound)
 NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound: Sound Sources")
 NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources)
 

diff --git a/nel/samples/sound/stream_file/CMakeLists.txt b/nel/samples/sound/stream_file/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_stream_file ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_stream_file nel::misc nelsound)
+TARGET_LINK_LIBRARIES(nl_sample_stream_file NeL::misc nelsound)
 NL_DEFAULT_PROPS(nl_sample_stream_file "NeL, Samples: Sound: Stream File")
 NL_ADD_RUNTIME_FLAGS(nl_sample_stream_file)
 

diff --git a/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt b/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_stream_ogg_vorbis ${SRC})
 
-TARGET_LINK_LIBRARIES(nl_sample_stream_ogg_vorbis nel::misc nelsound)
+TARGET_LINK_LIBRARIES(nl_sample_stream_ogg_vorbis NeL::misc nelsound)
 NL_DEFAULT_PROPS(nl_sample_stream_ogg_vorbis "NeL, Samples: Sound: Stream OGG Vorbis")
 NL_ADD_RUNTIME_FLAGS(nl_sample_stream_ogg_vorbis)
 

diff --git a/nel/src/3d/CMakeLists.txt b/nel/src/3d/CMakeLists.txt
@@ -718,7 +718,7 @@ NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${LIBVR_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nel3d nel::misc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
+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)