Changeset 252 in pacpusframework

Timestamp:

Dec 10, 2013, 5:34:35 PM (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

branche 0.1:

• add installation option with version number of PACPUS
• compilation on Win32 with Qt4.8.1, boost 1.54 and msvc10 : OK

branche 0.0:

• minor changes

Location:

branches

Files:

• 0.0.x/cmake/PacpusConfiguration.cmake (modified) (1 diff)
• 0.1.x/build (added)
• 0.1.x/build/build_win.bat (added)
• 0.1.x/cmake/PacpusConfiguration.cmake (modified) (2 diffs)
• 0.1.x/scripts/build-msvc.bat (modified) (1 diff)

branches/0.0.x/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)
         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")

branches/0.1.x/cmake/PacpusConfiguration.cmake

@@ -9 +9 @@
 
 # ========================================
-# Build-specific configuration
+# Build-specific configuration 
+# CACHE FILEPATH "Installation directory for the library"
 # ========================================
 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} )
+        endif()
+#    set(PACPUS_INSTALL_DIR    ${CMAKE_INSTALL_PREFIX}   CACHE FILEPATH "Installation directory for the library")
     set(PACPUS_INSTALL_3RD    FALSE                     CACHE BOOL      "Installation of the 3rd party")
 endif()
@@ -20 +25 @@
 # ========================================
 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_BUILD_EXAMPLES FALSE CACHE BOOL "Whether build the examples")

branches/0.1.x/scripts/build-msvc.bat

@@ -43 +43 @@
 set LOG4CXX_ROOT=%root_dir%\3rd\apache-log4cxx
 :: Initialize the build
-cmake .. -DPACPUS_INSTALL_DIR="%1" -DPACPUS_INSTALL_3RD=TRUE -DPACPUS_USE_LOG=TRUE
+cmake .. -DPACPUS_INSTALL_DIR="%1" -DPACPUS_INSTALL_3RD=TRUE -DPACPUS_USE_LOG=TRUE -DPACPUS_INSTALL_WITH_VERSION_NUMBER=TRUE
 :: Build in debug and release
 msbuild Pacpus.sln /p:Configuration=Debug