Changeset 91 in pacpusframework for trunk/cmake/Findlog4cxx.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/Findlog4cxx.cmake (modified) (2 diffs)

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