Changeset 91 in pacpusframework for trunk/cmake/PacpusConfiguration.cmake

Timestamp:

May 19, 2013, 12:32:48 PM (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

Improvement of the build system to avoid some workarounds

File:

• trunk/cmake/PacpusConfiguration.cmake (modified) (2 diffs)

trunk/cmake/PacpusConfiguration.cmake

@@ -11 +11 @@
 # Build-specific configuration
 # ========================================
+
+# TODO : check how cache variables work? Why the commented line doesn't work? 
+
 if(IS_BUILDING_PACPUS)
-    set(PACPUS_INSTALL_DIR    ${CMAKE_INSTALL_PREFIX}   CACHE FILEPATH "Installation directory for the library")
+        if(PACPUS_INSTALL_WITH_VERSION_NUMBER)
+                pacpus_purge_backslash(PACPUS_INSTALL_DIR)
+                set(PACPUS_INSTALL_DIR ${PACPUS_INSTALL_DIR}/${PACPUS_VERSION})
+#       set(PACPUS_INSTALL_DIR    ${CMAKE_INSTALL_PREFIX}/${PACPUS_VERSION}   CACHE PATH "Installation directory for the library")
+        endif()
     set(PACPUS_INSTALL_3RD    FALSE                     CACHE BOOL      "Installation of the 3rd party")
 endif()
+
 
 # ========================================
@@ -20 +28 @@
 # ========================================
 set(PACPUS_USE_LOG      TRUE  CACHE BOOL "Logging using log4cxx, the library is required")
-set(PACPUS_INSTALL_3RD  FALSE CACHE BOOL "Installation of the 3rd party")
+if(win32) 
+        set(PACPUS_INSTALL_3RD  TRUE CACHE BOOL "Installation of the 3rd party")
+else()
+        set(PACPUS_INSTALL_3RD  FALSE CACHE BOOL "Installation of the 3rd party")
+endif()
 set(PACPUS_BUILD_DOC    FALSE CACHE BOOL "Whether build the documentation - requires Doxygen")
 set(PACPUS_USE_SOLUTION_FOLDERS  FALSE CACHE BOOL "Use solution folders to classify projects, works in MS Visual Studio")