diff --git a/Processes/Proposal/CMakeLists_PROPOSAL.txt b/Processes/Proposal/CMakeLists_PROPOSAL.txt index e947d10e96670342f6f64375219ff5a615c84045..ad1b75b76d839ad1ac2173f4dbc1a6917d5a41c5 100644 --- a/Processes/Proposal/CMakeLists_PROPOSAL.txt +++ b/Processes/Proposal/CMakeLists_PROPOSAL.txt @@ -1,8 +1,16 @@ cmake_minimum_required(VERSION 3.8) +if(CMAKE_PROJECT_NAME STREQUAL corsika) + message(STATUS "Including PROPOSAL as part of CORSIKA8") + set (IN_CORSIKA8 ON) +else(CMAKE_PROJECT_NAME STREQUAL corsika) + set (IN_CORSIKA8 OFF) +endif(CMAKE_PROJECT_NAME STREQUAL corsika) + project(PROPOSAL VERSION 6.1.2 LANGUAGES CXX) +if (NOT IN_CORSIKA8) IF(APPLE) # In newer version of cmake this will be the default SET(CMAKE_MACOSX_RPATH 1) @@ -11,11 +19,6 @@ ENDIF(APPLE) # sets standard installtion paths include(GNUInstallDirs) -if(CMAKE_PROJECT_NAME STREQUAL corsika) - message(STATUS "Including PROPOSAL as part of CORSIKA8") - set (IN_CORSIKA8 ON) -else(CMAKE_PROJECT_NAME STREQUAL corsika) - set (IN_CORSIKA8 OFF) ### full RPATH ### copied from https://cmake.org/Wiki/CMake_RPATH_handling ### set the RPATH so that for using PROPOSAL in python @@ -30,7 +33,7 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE) # (but later on when installing) OPTION(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib64") -message(STATUS "${CMAKE_INSTALL_RPATH}") +message(STATUS "CMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") # add the automatically determined parts of the RPATH # which point to directories outside the build tree to the install RPATH @@ -39,16 +42,16 @@ OPTION(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # Some additional options OPTION(ADD_PYTHON "Choose to compile the python wrapper library" ON) -endif(CMAKE_PROJECT_NAME STREQUAL corsika) +endif (NOT IN_CORSIKA8) ################################################################# #################### PROPOSAL ######################## ################################################################# file(GLOB_RECURSE SRC_FILES ${PROJECT_SOURCE_DIR}/src/PROPOSAL/*) if (IN_CORSIKA8) -add_library(PROPOSAL STATIC ${SRC_FILES}) + add_library(PROPOSAL STATIC ${SRC_FILES}) else (IN_CORSIKA8) -add_library(PROPOSAL SHARED ${SRC_FILES}) + add_library(PROPOSAL SHARED ${SRC_FILES}) endif (IN_CORSIKA8) add_library(PROPOSAL::PROPOSAL ALIAS PROPOSAL) @@ -64,6 +67,7 @@ install( TARGETS PROPOSAL EXPORT PROPOSALTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # input version from the project call, so the library knows its own version @@ -91,7 +95,7 @@ endforeach() if(NOT IS_SYMLINK ${CMAKE_BINARY_DIR}/resources) - execute_process(COMMAND ln -sv ${CMAKE_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/resources OUTPUT_VARIABLE link_msg OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND ln -sv ${CMAKE_CURRENT_SOURCE_DIR}/resources ${CMAKE_BINARY_DIR}/resources OUTPUT_VARIABLE link_msg OUTPUT_STRIP_TRAILING_WHITESPACE) message(STATUS "Symlink to resources created:") message(STATUS " ${link_msg}") endif()