diff --git a/.gitmodules b/.gitmodules index cb79c58058e9360e53f096be77cbf0ee2aca2282..f79f2dd4cf234c1d437eb19b69900bd3d40798d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,6 @@ path = ThirdParty/spdlog url = https://github.com/gabime/spdlog.git shallow = true +[submodule "Processes/Proposal/PROPOSAL"] + path = Processes/Proposal/PROPOSAL + url = https://github.com/tudo-astroparticlephysics/PROPOSAL.git diff --git a/Processes/Proposal/CMakeLists.txt b/Processes/Proposal/CMakeLists.txt index 8d2a19788215b616ca2d6dd28199212ce8fc2918..b793dc1dde842ecfedab584c4888872dbdb9df0d 100644 --- a/Processes/Proposal/CMakeLists.txt +++ b/Processes/Proposal/CMakeLists.txt @@ -1,5 +1,8 @@ -# find_package(PROPOSAL REQUIRED ${LIB_INCLUDE}) - +set (ADD_PYTHON OFF) # for proposal +set (BUILD_TESTING OFF) # for proposal +add_subdirectory (PROPOSAL) +unset (ADD_PYTHON) +unset (BUILD_TESTING) FILE (GLOB MODEL_SOURCES *.cc) FILE (GLOB MODEL_HEADERS *.h) @@ -10,7 +13,6 @@ CORSIKA_COPY_HEADERS_TO_NAMESPACE (ProcessProposal ${MODEL_NAMESPACE} ${MODEL_HE SET_TARGET_PROPERTIES ( ProcessProposal PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1 - # PUBLIC_HEADER "${MODEL_HEADERS}" ) TARGET_LINK_LIBRARIES ( @@ -21,7 +23,7 @@ TARGET_LINK_LIBRARIES ( CORSIKAthirdparty CORSIKAgeometry CORSIKAenvironment - ${PROPOSAL_LIBRARY} + PROPOSAL::PROPOSAL ) TARGET_INCLUDE_DIRECTORIES ( @@ -31,16 +33,8 @@ TARGET_INCLUDE_DIRECTORIES ( $<INSTALL_INTERFACE:include/include> ) -TARGET_INCLUDE_DIRECTORIES ( - ProcessProposal - SYSTEM - PUBLIC ${PROPOSAL_INCLUDE_DIR} - INTERFACE ${PROPOSAL_INCLUDE_DIR} - ) - INSTALL ( TARGETS ProcessProposal LIBRARY DESTINATION lib ARCHIVE DESTINATION lib -# PUBLIC_HEADER DESTINATION include/${MODEL_NAMESPACE} ) diff --git a/Processes/Proposal/PROPOSAL b/Processes/Proposal/PROPOSAL new file mode 160000 index 0000000000000000000000000000000000000000..db516bd34ea00e8f8711b364a49d87e913ccdaaa --- /dev/null +++ b/Processes/Proposal/PROPOSAL @@ -0,0 +1 @@ +Subproject commit db516bd34ea00e8f8711b364a49d87e913ccdaaa diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index 13ea2ba05174de18daa7646059d3ab19295cc099..8b9b50be42e023054bcf82782713cfa34410cae7 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -18,7 +18,9 @@ mark_as_advanced (ThirdPartyChoiceValues) ############################################################################## # Build spdlog -add_subdirectory(spdlog) +set (CMAKE_POSITION_INDEPENDENT_CODE ON) # this is needed for PROPOSAL... since it is dynamic +add_subdirectory (spdlog) +unset (CMAKE_POSITION_INDEPENDENT_CODE) ############################################################################## # check for boost: either use C8 or system-level installation