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

refs#16

In Elementary_utils (trunk):
- Add the installation routines in CMakeLists.
- Add doxyfile.

In NumA++ (trunk):
- Add the installation routines in CMakeLists.
- Add FindElementaryUtils.cmake module and adapt CMakeLists.

In NumA++_Tests (trunk):
- Add FindElementaryUtils.cmake & FindNumA++.cmake modules and adapt CMakeLists.

In PARTONS (trunk):
- Add the installation routines in CMakeLists.
- Add FindElementaryUtils.cmake & FindNumA++.cmake modules and adapt CMakeLists.

In PARTONS_exe, PARTONS_release, PARTONS_Tests, PARTONS_Fits (trunk):
- Add FindElementaryUtils.cmake, FindNumA++.cmake & FindPARTONS.cmake modules and adapt CMakeLists.
parent e31b7899
......@@ -21,16 +21,18 @@ FIND_PACKAGE( Eigen3 REQUIRED)
FIND_PACKAGE( ROOT COMPONENTS Core Hist MathMore REQUIRED)
# ElementaryUtils
set(ELEMENTARY_UTILS_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../ElementaryUtils/include")
set(ELEMENTARY_UTILS_LIB_DIR "${CMAKE_SOURCE_DIR}/../ElementaryUtils/lib")
set(ELEMENTARY_UTILS_LIBRARIES ElementaryUtils)
FIND_PACKAGE(ElementaryUtils REQUIRED)
# Awful hack not need anymore:
#set(ELEMENTARY_UTILS_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../ElementaryUtils/include")
#set(ELEMENTARY_UTILS_LIB_DIR "${CMAKE_SOURCE_DIR}/../ElementaryUtils/lib")
#set(ELEMENTARY_UTILS_LIBRARIES ElementaryUtils)
# Inclusion de librarie ROOT
include_directories(${SFML_INCLUDE_DIR} ${ELEMENTARY_UTILS_INCLUDE_DIR} ${ROOT_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
# Link libraries
LINK_DIRECTORIES(${ELEMENTARY_UTILS_LIB_DIR})
# Link libraries # not needed anymore
#LINK_DIRECTORIES(${ELEMENTARY_UTILS_LIB_DIR}) # not needed any
#Inclusion des en-têtes publics
include_directories(include)
......@@ -66,4 +68,8 @@ target_link_libraries(
${SFML_LIBRARIES}
)
\ No newline at end of file
)
# Installation
install (TARGETS NumA++ DESTINATION lib/PARTONS)
install (DIRECTORY include/ DESTINATION include/PARTONS)
\ No newline at end of file
# - Try to find ElementaryUtils (both in system folders if it was installed, and in the current workspace)
#
# Once done this will define
#
# ELEMENTARY_UTILS_FOUND - system has Elementary_Utils lib
# ELEMENTARY_UTILS_LIBRARIES - the path of the library
# ELEMENTARY_UTILS_INCLUDE_DIR - the include directory
if (ELEMENTARY_UTILS_INCLUDE_DIR)
# in cache already
set(ELEMENTARY_UTILS_FOUND TRUE)
else (ELEMENTARY_UTILS_INCLUDE_DIR)
find_path(ELEMENTARY_UTILS_INCLUDE_DIR ElementaryUtils/PropertiesManager.h
PATHS
${CMAKE_INSTALL_PREFIX}/include/
${CMAKE_SOURCE_DIR}/../ElementaryUtils/include
PATH_SUFFIXES PARTONS
)
find_library(ELEMENTARY_UTILS_LIBRARIES
NAMES ElementaryUtils
PATHS
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
${CMAKE_SOURCE_DIR}/../ElementaryUtils/lib
PATH_SUFFIXES PARTONS)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ELEMENTARY_UTILS DEFAULT_MSG ELEMENTARY_UTILS_INCLUDE_DIR ELEMENTARY_UTILS_LIBRARIES)
endif(ELEMENTARY_UTILS_INCLUDE_DIR)
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