Commit 47943495 authored by Nabil Chouika's avatar Nabil Chouika
Browse files

refs#16

In ALL (trunk):
- Improvements on the previous cmake commits.
parent 5d0b6e70
......@@ -6,30 +6,33 @@
# ELEMENTARY_UTILS_LIBRARIES - the path of the library
# ELEMENTARY_UTILS_INCLUDE_DIR - the include directory
if (ELEMENTARY_UTILS_INCLUDE_DIR)
if (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
# in cache already
set(ELEMENTARY_UTILS_FOUND TRUE)
else (ELEMENTARY_UTILS_INCLUDE_DIR)
else (ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
find_path(ELEMENTARY_UTILS_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
PATHS
${CMAKE_INSTALL_PREFIX}/include/
${CMAKE_SOURCE_DIR}/../ElementaryUtils/include
PATH_SUFFIXES PARTONS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../ElementaryUtils
${CMAKE_SOURCE_DIR}/ElementaryUtils
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES include/PARTONS include
)
find_library(ELEMENTARY_UTILS_LIBRARIES
NAMES ElementaryUtils
PATHS
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
${CMAKE_SOURCE_DIR}/../ElementaryUtils/lib
PATH_SUFFIXES PARTONS)
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../ElementaryUtils
${CMAKE_SOURCE_DIR}/ElementaryUtils
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ELEMENTARY_UTILS DEFAULT_MSG ELEMENTARY_UTILS_INCLUDE_DIR ELEMENTARY_UTILS_LIBRARIES)
endif(ELEMENTARY_UTILS_INCLUDE_DIR)
endif(ELEMENTARY_UTILS_INCLUDE_DIR AND ELEMENTARY_UTILS_LIBRARIES)
......@@ -6,32 +6,37 @@
# NUMA_LIBRARIES - the path of the library
# NUMA_INCLUDE_DIR - the include directory
if (NUMA_INCLUDE_DIR)
if (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
# in cache already
set(NUMA_FOUND TRUE)
else (NUMA_INCLUDE_DIR)
else (NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
find_path(NUMA_INCLUDE_DIR NAMES NumA/integration/Integrator.h NumA++/integration/Integrator.h
PATHS
${CMAKE_INSTALL_PREFIX}/include/
${CMAKE_SOURCE_DIR}/../NumA/include
${CMAKE_SOURCE_DIR}/../NumA++/include
PATH_SUFFIXES PARTONS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../NumA
${CMAKE_SOURCE_DIR}/../NumA++
${CMAKE_SOURCE_DIR}/NumA
${CMAKE_SOURCE_DIR}/NumA++
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES include/PARTONS include
)
find_library(NUMA_LIBRARIES
NAMES NumA NumA++
PATHS
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
${CMAKE_SOURCE_DIR}/../NumA++/lib
${CMAKE_SOURCE_DIR}/../NumA/lib
PATH_SUFFIXES PARTONS)
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../NumA++
${CMAKE_SOURCE_DIR}/../NumA
${CMAKE_SOURCE_DIR}/NumA++
${CMAKE_SOURCE_DIR}/NumA
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NUMA DEFAULT_MSG NUMA_INCLUDE_DIR NUMA_LIBRARIES)
endif(NUMA_INCLUDE_DIR)
endif(NUMA_INCLUDE_DIR AND NUMA_LIBRARIES)
......@@ -6,30 +6,33 @@
# PARTONS_LIBRARIES - the path of the library
# PARTONS_INCLUDE_DIR - the include directory
if (PARTONS_INCLUDE_DIR)
if (PARTONS_INCLUDE_DIR AND PARTONS_LIBRARIES)
# in cache already
set(PARTONS_FOUND TRUE)
else (PARTONS_INCLUDE_DIR)
else (PARTONS_INCLUDE_DIR AND PARTONS_LIBRARIES)
find_path(PARTONS_INCLUDE_DIR NAMES partons/Partons.h
PATHS
${CMAKE_INSTALL_PREFIX}/include/
${CMAKE_SOURCE_DIR}/../PARTONS/include
PATH_SUFFIXES PARTONS
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../PARTONS
${CMAKE_SOURCE_DIR}/PARTONS
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES include/PARTONS include
)
find_library(PARTONS_LIBRARIES
NAMES PARTONS
PATHS
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
${CMAKE_SOURCE_DIR}/../PARTONS/lib
PATH_SUFFIXES PARTONS)
${CMAKE_INSTALL_PREFIX}
${CMAKE_SOURCE_DIR}/../PARTONS
${CMAKE_SOURCE_DIR}/PARTONS
${CMAKE_SOURCE_DIR}
PATH_SUFFIXES lib/PARTONS lib64/PARTONS bin/PARTONS lib lib64 bin)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PARTONS DEFAULT_MSG PARTONS_INCLUDE_DIR PARTONS_LIBRARIES)
endif(PARTONS_INCLUDE_DIR)
endif(PARTONS_INCLUDE_DIR AND PARTONS_LIBRARIES)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment