Changeset 306 in pacpusframework

Timestamp:

04/11/14 16:16:51 (10 years ago)

Author:

phudelai

Message:

Branche 0.1.x: deletion of useless magic search of location of PACPUS_INCLUDE_DIR. It is mandatory to set the PACPUS_ROOT variable so we use to configure the paths to PAPCUS dirs (include, libs, ...).

File:

• branches/0.1.x/cmake/FindPacpus.cmake (modified) (4 diffs)

branches/0.1.x/cmake/FindPacpus.cmake

@@ -12 +12 @@
 # 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()
+        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}'")
+        string (REPLACE "\\" "/" PACPUS_ROOT ${PACPUS_ROOT})
+        message(STATUS "Detected PACPUS_ROOT as argument with the path: '${PACPUS_ROOT}'")
 endif()
 
 
 # Locate the include files
-set(PACPUS_INCLUDE_HINTS
-    "${PACPUS_ROOT}/include"
-    "$ENV{PACPUS_ROOT}/include"
-)
-if(WIN32)
-    list(APPEND PACPUS_INCLUDE_HINTS
-        "C:/Program Files/Pacpus/include"
-        "C:/Program Files (x86)/Pacpus/include"
-        "C:/Pacpus/include"
-        "C:/lib/Pacpus/include"
-        "D:/Program Files/Pacpus/include"
-        "D:/Program Files (x86)/Pacpus/include"
-        "D:/Pacpus/include"
-        "D:/lib/Pacpus/include"
-    )
-else()
-    # TODO: add default paths no Unix-like systems
-    list(APPEND PACPUS_INCLUDE_HINTS
-    )
-endif()
-find_path(PACPUS_INCLUDE_DIR
-    NAMES "Pacpus/kernel/pacpus.h"
-    HINTS ${PACPUS_INCLUDE_HINTS}
-    DOC "The Pacpus include directory"
+set(PACPUS_INCLUDE_DIR
+        "${PACPUS_ROOT}/include"
 )
 
 if(NOT PACPUS_INCLUDE_DIR)
-    message(FATAL_ERROR "Could not find PACPUS. Please set CMake variable PACPUS_ROOT or environment variable PACPUS_ROOT.")
+        message(FATAL_ERROR "Could not find PACPUS. Please set CMake variable PACPUS_ROOT or environment variable PACPUS_ROOT.")
 endif()
-
 
 #get_filename_component(PACPUS_ROOT ${PACPUS_INCLUDE_DIR}/.. ABSOLUTE)
@@ -68 +45 @@
 set(PACPUS_MODULES "FileLib" "PacpusLib" "PacpusTools" "dbiteplayerlib")
 if(WIN32)
-    list(APPEND PACPUS_MODULES "ROAD_TIME")
+        list(APPEND PACPUS_MODULES "ROAD_TIME")
 endif()
 
@@ -78 +55 @@
 # Check the presence of each module
 foreach(module ${PACPUS_MODULES})
-    # release version
-    find_library(
-        PACPUS_${module}_LIB
-        NAMES ${module}
-        HINTS ${PACPUS_LIB_DIR}
-    )
-    if(PACPUS_${module}_LIB AND PACPUS_${module}_LIBD)
-        list(APPEND PACPUS_LIBRARIES optimized ${PACPUS_${module}_LIB})
-    else()
-        message(SEND_ERROR "Cannot find Pacpus module ${module} (release version)")
-        set(MODULE_MISSING TRUE)
-    endif()
-    
-    # debug version
-    find_library(
-        PACPUS_${module}_LIBD
-        NAMES ${module}_d
-        HINTS ${PACPUS_LIB_DIR}
-    )
-    if(PACPUS_${module}_LIB AND PACPUS_${module}_LIBD)
-        list(APPEND PACPUS_LIBRARIES debug ${PACPUS_${module}_LIBD})
-    else()
-        message(SEND_ERROR "Cannot find Pacpus module ${module}_d (debug version)")
-        set(MODULE_MISSING TRUE)
-    endif()
+
+        # release version
+        find_library(
+                PACPUS_${module}_LIB
+                NAMES ${module}
+                HINTS ${PACPUS_LIB_DIR}
+        )
+        if(PACPUS_${module}_LIB)
+                list(APPEND PACPUS_LIBRARIES optimized ${PACPUS_${module}_LIB})
+        else()
+                message(SEND_ERROR "Cannot find Pacpus module ${module} (release version)")
+                set(MODULE_MISSING TRUE)
+        endif()
+        
+        # debug version
+        find_library(
+                PACPUS_${module}_LIBD
+                NAMES ${module}_d
+                HINTS ${PACPUS_LIB_DIR}
+        )
+        if(PACPUS_${module}_LIBD)
+                list(APPEND PACPUS_LIBRARIES debug ${PACPUS_${module}_LIBD})
+        else()
+                message(SEND_ERROR "Cannot find Pacpus module ${module}_d (debug version)")
+                set(MODULE_MISSING TRUE)
+        endif()
+        
 endforeach()
 
@@ -112 +91 @@
 
 if(PACPUS_FOUND)
-    set(PACPUS_INSTALL_DIR ${PACPUS_ROOT})
-    set(PACPUS_CMAKE_DIR ${PACPUS_ROOT}/cmake)
-    set(CMAKE_INSTALL_PREFIX ${PACPUS_INSTALL_DIR})
-    list(APPEND CMAKE_PREFIX_PATH ${PACPUS_CMAKE_DIR})
-    list(APPEND CMAKE_MODULE_PATH "${PACPUS_CMAKE_DIR}")
-    
-    include(${PACPUS_CMAKE_DIR}/PacpusUtilities.cmake)
-    include(${PACPUS_CMAKE_DIR}/PacpusConfiguration.cmake)
-    include(${PACPUS_CMAKE_DIR}/PacpusDependencies.cmake)
-    include(${PACPUS_CMAKE_DIR}/PacpusPlatforms.cmake)
+        set(PACPUS_INSTALL_DIR ${PACPUS_ROOT})
+        set(PACPUS_CMAKE_DIR ${PACPUS_ROOT}/cmake)
+        set(CMAKE_INSTALL_PREFIX ${PACPUS_INSTALL_DIR})
+        list(APPEND CMAKE_PREFIX_PATH ${PACPUS_CMAKE_DIR})
+        list(APPEND CMAKE_MODULE_PATH "${PACPUS_CMAKE_DIR}")
+
+        include(${PACPUS_CMAKE_DIR}/PacpusUtilities.cmake)
+        include(${PACPUS_CMAKE_DIR}/PacpusConfiguration.cmake)
+        include(${PACPUS_CMAKE_DIR}/PacpusDependencies.cmake)
+        include(${PACPUS_CMAKE_DIR}/PacpusPlatforms.cmake)
 endif()