Changeset 80 in pacpusframework

Timestamp:

Feb 20, 2013, 12:10:18 PM (12 years ago)

Author:

morasjul

Message:

minor fix cocerning FindPacpus in case or Pacpus not found but not required
minor fix concerning -fpic option

Location:

trunk/cmake

Files:

• FindPacpus.cmake (modified) (2 diffs)
• PacpusPlatforms.cmake (modified) (1 diff)

trunk/cmake/FindPacpus.cmake

@@ -15 +15 @@
         set(PACPUS_ROOT $ENV{PACPUS_ROOT})
         message(STATUS "Detected PACPUS_ROOT, 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()
 endif()
 
-# Configure Pacpus
-include(${PACPUS_ROOT}/cmake/PacpusUtilities.cmake)
-include(${PACPUS_ROOT}/cmake/PacpusConfiguration.cmake)
-include(${PACPUS_ROOT}/cmake/PacpusDependencies.cmake)
-include(${PACPUS_ROOT}/cmake/PacpusPlatforms.cmake)
+
 
 # Hint directories
@@ -75 +78 @@
 if(NOT MODULE_MISSING AND PACPUS_INCLUDE_DIR)
     set(PACPUS_FOUND TRUE)
+
+    # Configure Pacpus
+    list(APPEND CMAKE_MODULE_PATH "${PACPUS_ROOT}/cmake")
+    include(${PACPUS_ROOT}/cmake/PacpusUtilities.cmake)
+    include(${PACPUS_ROOT}/cmake/PacpusConfiguration.cmake)
+    include(${PACPUS_ROOT}/cmake/PacpusDependencies.cmake)
+    include(${PACPUS_ROOT}/cmake/PacpusPlatforms.cmake)
+
+    #set(CMAKE_INSTALL_PREFIX ${PACPUS_ROOT})
+    set(PACPUS_INSTALL_DIR ${PACPUS_ROOT})
+    set(PACPUS_LIB_DIR "${PACPUS_ROOT}/lib"
+)
+    MESSAGE(STATUS "PACPUS_ROOT found ${PACPUS_ROOT}")
+
 else()
     set(PACPUS_FOUND FALSE)
+
+    if(PACPUS_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could'not find PACPUS_ROOT ")
+    else()
+      MESSAGE(STATUS "Could'not find PACPUS_ROOT ")
+    endif()
+
 endif()

trunk/cmake/PacpusPlatforms.cmake

@@ -11 +11 @@
 # GCC-Based compilers
 # ========================================
-if("${CMAKE_CXX_COMPILER}" MATCHES "gcc|icc|clang")
+if("${CMAKE_C_COMPILER}" MATCHES "gcc|icc|clang")
     pacpus_info("The libraries will be compiled with -fPIC")
     list(APPEND PACPUS_DEFINITIONS " -fPIC ")