more NeXus related adaptation for cmake.

This commit is contained in:
suter_a 2018-05-04 20:57:22 +02:00
parent 194bd31c8f
commit 3ddb736f88
2 changed files with 3 additions and 1 deletions

View File

@ -64,6 +64,7 @@ target_include_directories(dump_header
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MuSR_software/Class_MuSR_PSI/> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MuSR_software/Class_MuSR_PSI/>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/mud/src> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/mud/src>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/nexus>
) )
target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS}) target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})

View File

@ -65,12 +65,13 @@ add_library(PMusr SHARED
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
target_include_directories( target_include_directories(
PMusr BEFORE PRIVATE PMusr BEFORE PRIVATE
$<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
$<BUILD_INTERFACE:${MUSRFIT_INC}> $<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MuSR_software/Class_MuSR_PSI> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MuSR_software/Class_MuSR_PSI>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/mud/src> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/mud/src>
$<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/nexus>
) )
add_library(PUserFcnBase SHARED add_library(PUserFcnBase SHARED