Add user define of install libdir, includedir and moduldir

CMakeLists.txt

@@ -490,20 +490,44 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 #set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
-set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "Include directory")
-set(CMAKE_INSTALL_MODULDIR "modules" CACHE STRING "Modules directory")
+#set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "Include directory")
+#set(CMAKE_INSTALL_MODULDIR "modules" CACHE STRING "Modules directory")
+
+
+
+
+#Ser variables exportable for other projects
+
+
+
 
 message(STATUS "Initial CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}")
+set(PSB_CMAKE_INSTALL_PREFIX CMAKE_INSTALL_PREFIX)
 
-if(CMAKE_INSTALL_LIBDIR STREQUAL "lib64")
-    message(STATUS "CMAKE_INSTALL_LIBDIR is set to lib64. Overriding it to lib.")
+if(NOT PSB_CMAKE_INSTALL_LIBDIR)
+    message(STATUS "CMAKE_INSTALL_LIBDIR is set to default value lib")
     set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory" FORCE)
-elseif(CMAKE_INSTALL_LIBDIR STREQUAL "lib")
-    message(STATUS "CMAKE_INSTALL_LIBDIR is already set to lib.")
 else()
+    set(CMAKE_INSTALL_LIBDIR PSB_CMAKE_INSTALL_LIBDIR)
     message(STATUS "CMAKE_INSTALL_LIBDIR is set to: ${CMAKE_INSTALL_LIBDIR}")
 endif()
 
+if(NOT PSB_CMAKE_INSTALL_INCLUDEDIR)
+    message(STATUS "CMAKE_INSTALL_INCLUDEDIR is set to default value lib")
+    set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "Include directory" FORCE)
+else()
+    set(CMAKE_INSTALL_INCLUDEDIR PSB_CMAKE_INSTALL_INCLUDEDIR)
+    message(STATUS "CMAKE_INSTALL_INCLUDEDIR is set to: ${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+
+if(NOT PSB_CMAKE_INSTALL_MODULDIR)
+    message(STATUS "CMAKE_INSTALL_MODULDIR is set to default value lib")
+    set(CMAKE_INSTALL_MODULDIR "modules" CACHE STRING "Modules directory" FORCE)
+else()
+    set(CMAKE_INSTALL_MODULDIR PSB_CMAKE_INSTALL_MODULDIR)
+    message(STATUS "CMAKE_INSTALL_MODULDIR is set to: ${CMAKE_INSTALL_MODULDIR}")
+endif()
+
 
 
 
@@ -1074,12 +1098,7 @@ message(STATUS "CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR};")
 message(STATUS "CMAKE_INSTALL_INCLUDEDIR: ${CMAKE_INSTALL_INCLUDEDIR};")
 message(STATUS "CMAKE_INSTALL_MODULDIR: ${CMAKE_INSTALL_MODULDIR};")
 
-#Ser variables exportable for other projects
 
-set(PSB_CMAKE_INSTALL_PREFIX CMAKE_INSTALL_PREFIX)
-set(PSB_CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_LIBDIR)
-set(PSB_CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_INCLUDEDIR)
-set(PSB_CMAKE_INSTALL_MODULDIR CMAKE_INSTALL_MODULDIR)
 
 
 #-----------------