Changeset 346 in pacpusframework

Timestamp:

06/24/15 11:42:01 (9 years ago)

Author:

DHERBOMEZ Gérald

Message:

In pacpusframework/trunk (version 0.2.x):

• add the numbering version for installation

Location:

trunk

Files:

• cmake/PacpusConfiguration.cmake (modified) (1 diff)
• scripts/build-msvc.bat (modified) (1 diff)

trunk/cmake/PacpusConfiguration.cmake

@@ -12 +12 @@
 # ========================================
 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_3RD    FALSE                     CACHE BOOL      "Installation of the 3rd party")
 endif()

trunk/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
 REM msbuild Pacpus.sln /p:Configuration=Debug