Changeset 304 in pacpusframework for branches/0.1.x

Timestamp:

Apr 11, 2014, 12:10:12 PM (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

Branche 0.1.x: correction of macro FindPacpus, way to find PACPUS_ROOT bugged.

Location:

branches/0.1.x

Files:

• build/build_linux.sh (added)
• cmake/FindPacpus.cmake (modified) (3 diffs)

branches/0.1.x/cmake/FindPacpus.cmake

@@ -9 +9 @@
 
 # TODO: write the output variables of this CMake file.
+
+# Check PACPUS_ROOT
+if(NOT PACPUS_ROOT)
+    if(NOT ENV{PACPUS_ROOT} STREQUAL "")
+        set(PACPUS_ROOT $ENV{PACPUS_ROOT})
+        string (REPLACE "\\" "/" PACPUS_ROOT ${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 ")
+      else()
+        MESSAGE(STATUS "Could'not find PACPUS_ROOT ")
+        return()
+      endif()
+    endif()
+else()
+    string (REPLACE "\\" "/" PACPUS_ROOT ${PACPUS_ROOT})
+    message(STATUS "Detected PACPUS_ROOT as argument with the path: '${PACPUS_ROOT}'")
+endif()
+
 
 # Locate the include files
@@ -41 +61 @@
 endif()
 
-get_filename_component(PACPUS_ROOT ${PACPUS_INCLUDE_DIR}/.. ABSOLUTE)
+
+#get_filename_component(PACPUS_ROOT ${PACPUS_INCLUDE_DIR}/.. ABSOLUTE)
 set(PACPUS_LIB_DIR ${PACPUS_ROOT}/lib)
 
@@ -52 +73 @@
 set(MODULE_MISSING FALSE)
 set(PACPUS_LIBRARIES "")
+
+message (${PACPUS_LIB_DIR})
 
 # Check the presence of each module