Changeset 91 in pacpusframework for trunk/CMakeLists.txt

Timestamp:

05/19/13 12:32:48 (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

Improvement of the build system to avoid some workarounds

File:

• trunk/CMakeLists.txt (modified) (6 diffs)

trunk/CMakeLists.txt

@@ -15 +15 @@
 # ========================================
 set(PACPUS_MAJOR_VERSION 0)
-set(PACPUS_MINOR_VERSION 1)
-set(PACPUS_PATCH_VERSION 0)
+set(PACPUS_MINOR_VERSION 0)
+set(PACPUS_PATCH_VERSION 1)
 set(PACPUS_VERSION
     "${PACPUS_MAJOR_VERSION}.${PACPUS_MINOR_VERSION}.${PACPUS_PATCH_VERSION}")
@@ -23 +23 @@
 # CMake variables
 # ========================================
+set(IS_BUILDING_PACPUS      TRUE)
 set(PACPUS_ROOT_DIR         ${CMAKE_SOURCE_DIR})
 set(PACPUS_3RD_PARTY_DIR    ${PACPUS_ROOT_DIR}/3rd)
@@ -30 +31 @@
 set(PACPUS_SCRIPTS_DIR      ${PACPUS_ROOT_DIR}/scripts)
 set(PACPUS_SOURCE_DIR       ${PACPUS_ROOT_DIR}/src)
-set(IS_BUILDING_PACPUS      TRUE)
+
 
 # ========================================
@@ -84 +85 @@
 # ========================================
 include(${PACPUS_CMAKE_DIR}/PacpusInstall.cmake)
+set( ENV{PACPUS_ROOT} ${PACPUS_INSTALL_DIR} )
 
 # ========================================
@@ -114 +116 @@
 pacpus_info("  Result:")
 pacpus_info("    Install directory:" ${PACPUS_INSTALL_DIR})
+pacpus_info("    Install with version number:" ${PACPUS_INSTALL_WITH_VERSION_NUMBER})
 pacpus_info("")
 pacpus_info("  Options:")
@@ -121 +124 @@
 pacpus_info("")
 if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-    message(WARNING "The src directory is the same as bin directory. \"make clean\" may damage the source tree")
+    message(WARNING "The source directory is the same as build directory. \"make clean\" may damage the source tree")
 endif()