From 1b2e607d5d2538f7ecf121538d9c658df724087c Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 21 Dec 2015 17:05:18 +0100
Subject: [PATCH] Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin,
 etc, share, etc...)

--HG--
branch : develop
---
 code/CMakeModules/nel.cmake | 114 +++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index bb19183b8..b4add81a0 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -218,6 +218,11 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
     OPTION(WITH_EXTERNAL          "With provided external."                       OFF)
   ENDIF(WIN32)
   OPTION(WITH_STATIC_EXTERNAL     "With static external libraries"                OFF)
+  IF(UNIX AND NOT APPLE)
+    OPTION(WITH_UNIX_STRUCTURE    "Use UNIX structure (bin, include, lib)"        ON )
+  ELSE()
+    OPTION(WITH_UNIX_STRUCTURE    "Use UNIX structure (bin, include, lib)"        OFF)
+  ENDIF()
   OPTION(WITH_INSTALL_LIBRARIES   "Install development files."                    ON )
 
   OPTION(WITH_ASSIMP              "Use assimp exporter"                           OFF)
@@ -908,121 +913,120 @@ ENDMACRO(NL_SETUP_BUILD_FLAGS)
 MACRO(NL_MAKE_ABSOLUTE_PREFIX NAME_RELATIVE NAME_ABSOLUTE)
   IF(IS_ABSOLUTE "${${NAME_RELATIVE}}")
     SET(${NAME_ABSOLUTE} ${${NAME_RELATIVE}})
-  ELSE(IS_ABSOLUTE "${${NAME_RELATIVE}}")
-    IF(WIN32)
-      SET(${NAME_ABSOLUTE} ${${NAME_RELATIVE}})
-    ELSE(WIN32)
+  ELSE()
+    IF(WITH_UNIX_STRUCTURE)
       SET(${NAME_ABSOLUTE} ${CMAKE_INSTALL_PREFIX}/${${NAME_RELATIVE}})
-    ENDIF(WIN32)
+    ELSE()
+      SET(${NAME_ABSOLUTE} ${${NAME_RELATIVE}})
+    ENDIF()
   ENDIF(IS_ABSOLUTE "${${NAME_RELATIVE}}")
 ENDMACRO(NL_MAKE_ABSOLUTE_PREFIX)
 
 MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/etc path.
   IF(NOT NL_ETC_PREFIX)
-    IF(WIN32)
-      SET(NL_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(NL_ETC_PREFIX "etc/nel" CACHE PATH "Installation path for configurations")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_ETC_PREFIX)
+    ELSE()
+      SET(NL_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_ETC_PREFIX NL_ETC_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/share path.
   IF(NOT NL_SHARE_PREFIX)
-    IF(WIN32)
-      SET(NL_SHARE_PREFIX "." CACHE PATH "Installation path for data.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(NL_SHARE_PREFIX "share/nel" CACHE PATH "Installation path for data.")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_SHARE_PREFIX)
+    ELSE()
+      SET(NL_SHARE_PREFIX "." CACHE PATH "Installation path for data.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_SHARE_PREFIX NL_SHARE_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/sbin path.
   IF(NOT NL_SBIN_PREFIX)
-    IF(WIN32)
-      SET(NL_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(NL_SBIN_PREFIX "sbin" CACHE PATH "Installation path for admin tools and services.")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_SBIN_PREFIX)
+    ELSE()
+      SET(NL_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_SBIN_PREFIX NL_SBIN_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/bin path.
   IF(NOT NL_BIN_PREFIX)
-    IF(WIN32)
-      SET(NL_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(NL_BIN_PREFIX "bin" CACHE PATH "Installation path for tools and applications.")
-    ENDIF(WIN32)
-  ENDIF(NOT NL_BIN_PREFIX)
+    ELSE()
+      SET(NL_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_BIN_PREFIX NL_BIN_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/lib path.
   IF(NOT NL_LIB_PREFIX)
     IF(LIBRARY_ARCHITECTURE)
       SET(NL_LIB_PREFIX "lib/${LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
-    ELSE(LIBRARY_ARCHITECTURE)
+    ELSE()
       SET(NL_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
-    ENDIF(LIBRARY_ARCHITECTURE)
-  ENDIF(NOT NL_LIB_PREFIX)
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_LIB_PREFIX NL_LIB_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/lib path.
   IF(NOT NL_DRIVER_PREFIX)
-    IF(WIN32)
-      SET(NL_DRIVER_PREFIX "." CACHE PATH "Installation path for drivers.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       IF(LIBRARY_ARCHITECTURE)
         SET(NL_DRIVER_PREFIX "lib/${LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
-      ELSE(LIBRARY_ARCHITECTURE)
+      ELSE()
         SET(NL_DRIVER_PREFIX "lib/nel" CACHE PATH "Installation path for drivers.")
-      ENDIF(LIBRARY_ARCHITECTURE)
-    ENDIF(WIN32)
-  ENDIF(NOT NL_DRIVER_PREFIX)
+      ENDIF()
+    ELSE()
+      SET(NL_DRIVER_PREFIX "." CACHE PATH "Installation path for drivers.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(NL_DRIVER_PREFIX NL_DRIVER_ABSOLUTE_PREFIX)
-
 ENDMACRO(NL_SETUP_PREFIX_PATHS)
 
 MACRO(RYZOM_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/etc path.
   IF(NOT RYZOM_ETC_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(RYZOM_ETC_PREFIX "etc/ryzom" CACHE PATH "Installation path for configurations")
-    ENDIF(WIN32)
+    ELSE()
+      SET(RYZOM_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
+    ENDIF()
   ENDIF(NOT RYZOM_ETC_PREFIX)
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_ETC_PREFIX RYZOM_ETC_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/share path.
   IF(NOT RYZOM_SHARE_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_SHARE_PREFIX "." CACHE PATH "Installation path for data.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(RYZOM_SHARE_PREFIX "share/ryzom" CACHE PATH "Installation path for data.")
-    ENDIF(WIN32)
-  ENDIF(NOT RYZOM_SHARE_PREFIX)
+    ELSE()
+      SET(RYZOM_SHARE_PREFIX "." CACHE PATH "Installation path for data.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_SHARE_PREFIX RYZOM_SHARE_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/sbin path.
   IF(NOT RYZOM_SBIN_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(RYZOM_SBIN_PREFIX "sbin" CACHE PATH "Installation path for admin tools and services.")
-    ENDIF(WIN32)
-  ENDIF(NOT RYZOM_SBIN_PREFIX)
+    ELSE()
+      SET(RYZOM_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_SBIN_PREFIX RYZOM_SBIN_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/bin path.
   IF(NOT RYZOM_BIN_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(RYZOM_BIN_PREFIX "bin" CACHE PATH "Installation path for tools.")
-    ENDIF(WIN32)
-  ENDIF(NOT RYZOM_BIN_PREFIX)
+    ELSE()
+      SET(RYZOM_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_BIN_PREFIX RYZOM_BIN_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/lib path.