From 4df0fd37f3dd93be1d8bc18d7edc595d503ebf03 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sat, 28 Jul 2018 11:45:49 +0200
Subject: [PATCH] Changed: Define and use LIB_SUFFIX

--HG--
branch : develop
---
 code/CMakeLists.txt         | 13 +++++++++++++
 code/CMakeModules/nel.cmake | 24 +++++++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 87367c98e..022c34659 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -249,6 +249,19 @@ IF(WITH_NEL)
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)
+
+  # Aliases for targets
+  SET(NELMISC_LIBRARIES nelmisc)
+  SET(NELNET_LIBRARIES nelnet)
+  SET(NELLIGO_LIBRARIES nelligo)
+  SET(NELGEORGES_LIBRARIES nelgeorges)
+  SET(NEL3D_LIBRARIES nel3d)
+  SET(NELGUI_LIBRARIES nelgui)
+  SET(NELSOUND_LIBRARIES nelsound)
+ELSE()
+#  FIND_PACKAGE(NeL COMPONENTS 3d misc pacs sound nimp REQUIRED)
+  FIND_PACKAGE(NeL REQUIRED)
+  INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIRS})
 ENDIF()
 
 IF(WITH_RYZOM)
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 258e777aa..453b1fe1a 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -1041,6 +1041,12 @@ MACRO(NL_MAKE_ABSOLUTE_PREFIX NAME_RELATIVE NAME_ABSOLUTE)
 ENDMACRO(NL_MAKE_ABSOLUTE_PREFIX)
 
 MACRO(NL_SETUP_PREFIX_PATHS)
+  IF(TARGET_X64 AND WIN32)
+    SET(LIB_SUFFIX "64")
+  ELSE()
+    SET(LIB_SUFFIX "")
+  ENDIF()
+
   ## Allow override of install_prefix/etc path.
   IF(NOT NL_ETC_PREFIX)
     IF(WITH_UNIX_STRUCTURE)
@@ -1064,7 +1070,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/sbin path.
   IF(NOT NL_SBIN_PREFIX)
     IF(WITH_UNIX_STRUCTURE)
-      SET(NL_SBIN_PREFIX "sbin" CACHE PATH "Installation path for admin tools and services.")
+      SET(NL_SBIN_PREFIX "sbin${LIB_SUFFIX}" CACHE PATH "Installation path for admin tools and services.")
     ELSE()
       SET(NL_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
     ENDIF()
@@ -1074,7 +1080,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/bin path.
   IF(NOT NL_BIN_PREFIX)
     IF(WITH_UNIX_STRUCTURE)
-      SET(NL_BIN_PREFIX "bin" CACHE PATH "Installation path for tools and applications.")
+      SET(NL_BIN_PREFIX "bin${LIB_SUFFIX}" CACHE PATH "Installation path for tools and applications.")
     ELSE()
       SET(NL_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
     ENDIF()
@@ -1086,7 +1092,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(LIBRARY_ARCHITECTURE)
       SET(NL_LIB_PREFIX "lib/${LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
     ELSE()
-      SET(NL_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
+      SET(NL_LIB_PREFIX "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries.")
     ENDIF()
   ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_LIB_PREFIX NL_LIB_ABSOLUTE_PREFIX)
@@ -1097,7 +1103,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
       IF(LIBRARY_ARCHITECTURE)
         SET(NL_DRIVER_PREFIX "lib/${LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
       ELSE()
-        SET(NL_DRIVER_PREFIX "lib/nel" CACHE PATH "Installation path for drivers.")
+        IF(WIN32)
+          SET(NL_DRIVER_PREFIX "bin${LIB_SUFFIX}" CACHE PATH "Installation path for drivers.")
+        ELSE()
+          SET(NL_DRIVER_PREFIX "lib${LIB_SUFFIX}/nel" CACHE PATH "Installation path for drivers.")
+        ENDIF()
       ENDIF()
     ELSE()
       SET(NL_DRIVER_PREFIX "." CACHE PATH "Installation path for drivers.")
@@ -1130,7 +1140,7 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/sbin path.
   IF(NOT RYZOM_SBIN_PREFIX)
     IF(WITH_UNIX_STRUCTURE)
-      SET(RYZOM_SBIN_PREFIX "sbin" CACHE PATH "Installation path for admin tools and services.")
+      SET(RYZOM_SBIN_PREFIX "sbin${LIB_SUFFIX}" CACHE PATH "Installation path for admin tools and services.")
     ELSE()
       SET(RYZOM_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
     ENDIF()
@@ -1140,7 +1150,7 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/bin path.
   IF(NOT RYZOM_BIN_PREFIX)
     IF(WITH_UNIX_STRUCTURE)
-      SET(RYZOM_BIN_PREFIX "bin" CACHE PATH "Installation path for tools.")
+      SET(RYZOM_BIN_PREFIX "bin${LIB_SUFFIX}" CACHE PATH "Installation path for tools.")
     ELSE()
       SET(RYZOM_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
     ENDIF()
@@ -1152,7 +1162,7 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
     IF(LIBRARY_ARCHITECTURE)
       SET(RYZOM_LIB_PREFIX "lib/${LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
     ELSE()
-      SET(RYZOM_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
+      SET(RYZOM_LIB_PREFIX "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries.")
     ENDIF()
   ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_LIB_PREFIX RYZOM_LIB_ABSOLUTE_PREFIX)