Changeset 91 in pacpusframework for trunk/cmake

Timestamp:

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

Author:

DHERBOMEZ Gérald

Message:

Improvement of the build system to avoid some workarounds

Location:

trunk/cmake

Files:

• FindPacpus.cmake (modified) (2 diffs)
• Findlog4cxx.cmake (modified) (2 diffs)
• PacpusConfiguration.cmake (modified) (2 diffs)
• PacpusInstall.cmake (modified) (1 diff)

trunk/cmake/FindPacpus.cmake

@@ -14 +14 @@
     if(NOT ENV{PACPUS_ROOT} STREQUAL "")
         set(PACPUS_ROOT $ENV{PACPUS_ROOT})
-        message(STATUS "Detected PACPUS_ROOT, set to '${PACPUS_ROOT}'")
+        message(STATUS "Detected PACPUS_ROOT in environment, set to '${PACPUS_ROOT}'")
     else()
       if(PACPUS_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could'not find PACPUS_ROOT ")
+                MESSAGE(FATAL_ERROR "Could'not find PACPUS_ROOT ")
       else()
-        MESSAGE(STATUS "Could'not find PACPUS_ROOT ")
-        return()
+                MESSAGE(STATUS "Could'not find PACPUS_ROOT ")
+                return()
       endif()
     endif()
+else()
+        message(STATUS "Detected PACPUS_ROOT as argument with the path: '${PACPUS_ROOT}'")
 endif()
 
@@ -88 +90 @@
     #set(CMAKE_INSTALL_PREFIX ${PACPUS_ROOT})
     set(PACPUS_INSTALL_DIR ${PACPUS_ROOT})
-    set(PACPUS_LIB_DIR "${PACPUS_ROOT}/lib"
-)
+    set(PACPUS_LIB_DIR "${PACPUS_ROOT}/lib")
     MESSAGE(STATUS "PACPUS_ROOT found ${PACPUS_ROOT}")
 

trunk/cmake/Findlog4cxx.cmake

@@ -14 +14 @@
 include(FindPackageHandleStandardArgs)
 
-IF(IS_BUILDING_PACPUS)
-        MESSAGE(AUTHOR_WARNING "Find log4cxx should use the folder inside pacpusframework to set include and library directories and not the environment variable LOG4CXX_ROOT")
-ENDIF(IS_BUILDING_PACPUS)
+# For Windows, when building Pacpus use the local log4cxx files, else use the log4cxx files in the pacpus install dir
+if(WIN32)
+        if(IS_BUILDING_PACPUS)
+                SET(LOG4CXX_ROOT "3rd/apache-log4cxx")
+        elseif(PACPUS_ROOT)
+                SET(LOG4CXX_ROOT "${PACPUS_ROOT}/3rd/apache-log4cxx")
+        else()
+                SET(LOG4CXX_ROOT "$ENV{PACPUS_ROOT}/3rd/apache-log4cxx")
+        endif()
+endif()
 
-# See if LOG4CXX_ROOT is not already set in CMake
-if(NOT LOG4CXX_ROOT)
-    # See if LOG4CXX_ROOT is set in process environment
-    if( NOT $ENV{LOG4CXX_ROOT} STREQUAL "" )
-        SET(LOG4CXX_ROOT "$ENV{LOG4CXX_ROOT}")
-        MESSAGE(STATUS "Detected LOG4CXX_ROOT set to '${LOG4CXX_ROOT}'")
-    endif()
-endif()
+
 
 set(LOG4CXX_INC_LIST
@@ -90 +90 @@
 
 # Output variables
-set(LOG4CXX_LIBRARIES "")
 if(LOG4CXX_FOUND)
     # Include dirs

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")

trunk/cmake/PacpusInstall.cmake

@@ -32 +32 @@
 # ========================================
 if(PACPUS_INSTALL_3RD)
-    install(
-    DIRECTORY
-        ${PACPUS_3RD_PARTY_DIR}
-    DESTINATION
-        ${PACPUS_INSTALL_DIR}
-    )
+        if(WIN32)
+                install(
+                DIRECTORY
+                        ${PACPUS_3RD_PARTY_DIR}
+                DESTINATION
+                        ${PACPUS_INSTALL_DIR}
+                        )
+        endif()
 endif()