Changed: Under Windows, install all files in the same folder excepted includes and libs

code/CMakeModules/nel.cmake

@@ -638,7 +638,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/etc path.
   IF(NOT NL_ETC_PREFIX)
     IF(WIN32)
-      SET(NL_ETC_PREFIX "../etc/nel" CACHE PATH "Installation path for configurations")
+      SET(NL_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
     ELSE(WIN32)
       SET(NL_ETC_PREFIX "etc/nel" CACHE PATH "Installation path for configurations")
     ENDIF(WIN32)
@@ -648,7 +648,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/share path.
   IF(NOT NL_SHARE_PREFIX)
     IF(WIN32)
-      SET(NL_SHARE_PREFIX "../share/nel" CACHE PATH "Installation path for data.")
+      SET(NL_SHARE_PREFIX "." CACHE PATH "Installation path for data.")
     ELSE(WIN32)
       SET(NL_SHARE_PREFIX "share/nel" CACHE PATH "Installation path for data.")
     ENDIF(WIN32)
@@ -658,7 +658,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/sbin path.
   IF(NOT NL_SBIN_PREFIX)
     IF(WIN32)
-      SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
+      SET(NL_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.")
     ELSE(WIN32)
       SET(NL_SBIN_PREFIX "sbin" CACHE PATH "Installation path for admin tools and services.")
     ENDIF(WIN32)
@@ -668,7 +668,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
   ## Allow override of install_prefix/bin path.
   IF(NOT NL_BIN_PREFIX)
     IF(WIN32)
-      SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
+      SET(NL_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.")
     ELSE(WIN32)
       SET(NL_BIN_PREFIX "bin" CACHE PATH "Installation path for tools and applications.")
     ENDIF(WIN32)
@@ -677,22 +677,18 @@ MACRO(NL_SETUP_PREFIX_PATHS)
 
   ## Allow override of install_prefix/lib path.
   IF(NOT NL_LIB_PREFIX)
-    IF(WIN32)
-      SET(NL_LIB_PREFIX "../lib" CACHE PATH "Installation path for libraries.")
-    ELSE(WIN32)
-      IF(CMAKE_LIBRARY_ARCHITECTURE)
-        SET(NL_LIB_PREFIX "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
-      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
-        SET(NL_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
-      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
-    ENDIF(WIN32)
+    IF(CMAKE_LIBRARY_ARCHITECTURE)
+      SET(NL_LIB_PREFIX "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
+    ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+      SET(NL_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
+    ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
   ENDIF(NOT NL_LIB_PREFIX)
   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 "../lib" CACHE PATH "Installation path for drivers.")
+      SET(NL_DRIVER_PREFIX "." CACHE PATH "Installation path for drivers.")
     ELSE(WIN32)
       IF(CMAKE_LIBRARY_ARCHITECTURE)
         SET(NL_DRIVER_PREFIX "lib/${CMAKE_LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
@@ -748,15 +744,11 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
 
   ## Allow override of install_prefix/lib path.
   IF(NOT RYZOM_LIB_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_LIB_PREFIX "." CACHE PATH "Installation path for libraries.")
-    ELSE(WIN32)
-      IF(CMAKE_LIBRARY_ARCHITECTURE)
-        SET(RYZOM_LIB_PREFIX "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
-      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
-        SET(RYZOM_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
-      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
-    ENDIF(WIN32)
+    IF(CMAKE_LIBRARY_ARCHITECTURE)
+      SET(RYZOM_LIB_PREFIX "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
+    ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+      SET(RYZOM_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
+    ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
   ENDIF(NOT RYZOM_LIB_PREFIX)
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_LIB_PREFIX RYZOM_LIB_ABSOLUTE_PREFIX)