LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

added missing includes and shared libs.

Browse Source
This commit is contained in:
suter_a 2018-05-06 15:58:47 +02:00
parent dbf9c930e6
commit 5384da49e1
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/external/MagProximity/CMakeLists.txt vendored
View File

@ -1,8 +1,13 @@
# - Mag. Proximity library ---------------------------------------------------- # - Mag. Proximity library ----------------------------------------------------
#--- generate necessary dictionaries ------------------------------------------ #--- generate necessary dictionaries ------------------------------------------
set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
root_generate_dictionary( root_generate_dictionary(
PMagProximityFitterDict PMagProximityFitter.h LINKDEF PMagProximityFitterLinkDef.h PMagProximityFitterDict
-I${FFTW3_INCLUDE}
-I${MUSRFIT_INC}
PMagProximityFitter.h
LINKDEF PMagProximityFitterLinkDef.h
) )
root_generate_dictionary( root_generate_dictionary(
PMPStartupHandlerDict PMPStartupHandler.h LINKDEF PMPStartupHandlerLinkDef.h PMPStartupHandlerDict PMPStartupHandler.h LINKDEF PMPStartupHandlerLinkDef.h
@ -27,11 +32,14 @@ add_library(PMagProximityFitter SHARED
) )
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
target_include_directories( target_include_directories(
PMagProximityFitter BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PMagProximityFitter BEFORE PRIVATE
$<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
$<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )
#--- add library dependencies ------------------------------------------------- #--- add library dependencies -------------------------------------------------
target_link_libraries(PMagProximityFitter PUserFcnBase ${ROOT_LIBRARIES}) target_link_libraries(PMagProximityFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
#--- install PMagProximityFitter solib ---------------------------------------- #--- install PMagProximityFitter solib ----------------------------------------
install(TARGETS PMagProximityFitter DESTINATION lib) install(TARGETS PMagProximityFitter DESTINATION lib)

15
src/external/Nonlocal/CMakeLists.txt vendored
View File

@ -1,8 +1,14 @@
# - Nonlocal library ---------------------------------------------------------- # - Nonlocal library ----------------------------------------------------------
#--- generate necessary dictionaries ------------------------------------------ #--- generate necessary dictionaries ------------------------------------------
set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
root_generate_dictionary( root_generate_dictionary(
PNL_PippardFitterDict PNL_PippardFitter.h LINKDEF PNL_PippardFitterLinkDef.h PNL_PippardFitterDict
-I${FFTW3_INCLUDE_DIR}
-I${MUSRFIT_INC}
PNL_PippardFitter.h
LINKDEF PNL_PippardFitterLinkDef.h
) )
root_generate_dictionary( root_generate_dictionary(
PNL_StartupHandlerDict PNL_StartupHandler.h LINKDEF PNL_StartupHandlerLinkDef.h PNL_StartupHandlerDict PNL_StartupHandler.h LINKDEF PNL_StartupHandlerLinkDef.h
@ -27,11 +33,14 @@ add_library(PNL_PippardFitter SHARED
) )
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
target_include_directories( target_include_directories(
PNL_PippardFitter BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PNL_PippardFitter BEFORE PRIVATE
$<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
$<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )
#--- add library dependencies ------------------------------------------------- #--- add library dependencies -------------------------------------------------
target_link_libraries(PNL_PippardFitter PUserFcnBase ${FFTW3_LIBRARIES} ${ROOT_LIBRARIES}) target_link_libraries(PNL_PippardFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase)
#--- install PNL_PippardFitter solib ------------------------------------------ #--- install PNL_PippardFitter solib ------------------------------------------
install(TARGETS PNL_PippardFitter DESTINATION lib) install(TARGETS PNL_PippardFitter DESTINATION lib)