Commit 5a41e502 authored by Nabil Chouika's avatar Nabil Chouika
Browse files

refs#16

In ALL (trunk):
- Improvements on the previous cmake commits.
parent a37d1d7f
......@@ -71,5 +71,8 @@ target_link_libraries(
)
# Installation
install (TARGETS NumA++ DESTINATION lib/PARTONS)
install (TARGETS NumA++
RUNTIME DESTINATION bin/PARTONS
LIBRARY DESTINATION lib/PARTONS
ARCHIVE DESTINATION lib/static/PARTONS)
install (DIRECTORY include/ DESTINATION include/PARTONS)
\ No newline at end of file
......@@ -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)
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