Skip to content

GitLab

Commit 6b298607 authored by Stephen's avatar Stephen
Browse files

Change install call to use original if not conda build

parent 333510d4
Hide whitespace changes
Inline Side-by-side
Framework/API/CMakeLists.txt
View file @ 6b298607
...@@ -574,11 +574,9 @@ target_include_directories(API PUBLIC ...@@ -574,11 +574,9 @@ target_include_directories(API PUBLIC
generate_mantid_export_header(API TRUE) generate_mantid_export_header(API TRUE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidAPITargets") set(TARGET_EXPORT_NAME "MantidAPITargets")
mtd_install_dylib(TARGETS API INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS API INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS API INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR})
FILE ${TARGET_EXPORT_NAME}.cmake endif()
NAMESPACE Mantid:: \ No newline at end of file
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
\ No newline at end of file
Framework/Algorithms/CMakeLists.txt
View file @ 6b298607
...@@ -1073,17 +1073,16 @@ target_include_directories(Algorithms PUBLIC ...@@ -1073,17 +1073,16 @@ target_include_directories(Algorithms PUBLIC
generate_mantid_export_header(Algorithms FALSE) generate_mantid_export_header(Algorithms FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidAlgorithmsTargets") set(TARGET_EXPORT_NAME "MantidAlgorithmsTargets")
mtd_install_dylib(TARGETS mtd_install_framework_lib(TARGETS
Algorithms Algorithms
INSTALL_EXPORT_FILE INSTALL_EXPORT_FILE
EXPORT_NAME ${TARGET_EXPORT_NAME} EXPORT_NAME ${TARGET_EXPORT_NAME})
INSTALL_DIRS else()
${PLUGINS_DIR} mtd_install_targets(TARGETS
${WORKBENCH_PLUGINS_DIR}) Algorithms
INSTALL_DIRS
install(EXPORT ${TARGET_EXPORT_NAME} ${PLUGINS_DIR}
FILE ${TARGET_EXPORT_NAME}.cmake ${WORKBENCH_PLUGINS_DIR})
NAMESPACE Mantid:: endif()
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework \ No newline at end of file
)
\ No newline at end of file
Framework/Beamline/CMakeLists.txt
View file @ 6b298607
...@@ -67,11 +67,13 @@ target_include_directories(Beamline PUBLIC ...@@ -67,11 +67,13 @@ target_include_directories(Beamline PUBLIC
generate_mantid_export_header(Beamline FALSE) generate_mantid_export_header(Beamline FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidBeamlineTargets") set(TARGET_EXPORT_NAME "MantidBeamlineTargets")
mtd_install_dylib(TARGETS Beamline INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Beamline INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake Beamline
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${LIB_DIR}
) ${WORKBENCH_LIB_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/CMakeLists.txt
View file @ 6b298607
...@@ -180,7 +180,7 @@ if(NOT FULL_PACKAGE_BUILD) ...@@ -180,7 +180,7 @@ if(NOT FULL_PACKAGE_BUILD)
add_subdirectory(PostInstall) add_subdirectory(PostInstall)
endif() endif()
if (CONDA_BUILD)
configure_package_config_file(${CMAKE_SOURCE_DIR}/buildconfig/CMake/MantidFrameworkConfig.cmake.in configure_package_config_file(${CMAKE_SOURCE_DIR}/buildconfig/CMake/MantidFrameworkConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/MantidFrameworkConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/MantidFrameworkConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework) INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework)
...@@ -196,7 +196,6 @@ install(FILES ...@@ -196,7 +196,6 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
) )
install(FILES install(FILES
${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindNexus.cmake ${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindNexus.cmake
${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindJsonCPP.cmake ${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindJsonCPP.cmake
...@@ -204,3 +203,4 @@ ${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindTBB.cmake ...@@ -204,3 +203,4 @@ ${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindTBB.cmake
${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindMuParser.cmake ${CMAKE_SOURCE_DIR}/buildconfig/CMake/FindMuParser.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework/find_modules DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework/find_modules
) )
endif()
\ No newline at end of file
Framework/Catalog/CMakeLists.txt
View file @ 6b298607
...@@ -71,11 +71,13 @@ target_include_directories(Catalog PUBLIC ...@@ -71,11 +71,13 @@ target_include_directories(Catalog PUBLIC
generate_mantid_export_header(Catalog TRUE) generate_mantid_export_header(Catalog TRUE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidCatalogTargets") set(TARGET_EXPORT_NAME "MantidCatalogTargets")
mtd_install_dylib(TARGETS Catalog INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Catalog INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake Catalog
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${LIB_DIR}
) ${WORKBENCH_LIB_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/Crystal/CMakeLists.txt
View file @ 6b298607
...@@ -276,10 +276,13 @@ target_include_directories(Crystal PUBLIC ...@@ -276,10 +276,13 @@ target_include_directories(Crystal PUBLIC
generate_mantid_export_header(Crystal FALSE) generate_mantid_export_header(Crystal FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidCrystalTargets") set(TARGET_EXPORT_NAME "MantidCrystalTargets")
mtd_install_dylib(TARGETS Crystal INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Crystal INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake Crystal
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework) ${PLUGINS_DIR}
${WORKBENCH_PLUGINS_DIR})
endif()
\ No newline at end of file
Framework/CurveFitting/CMakeLists.txt
View file @ 6b298607
...@@ -543,11 +543,13 @@ target_include_directories(CurveFitting PUBLIC ...@@ -543,11 +543,13 @@ target_include_directories(CurveFitting PUBLIC
generate_mantid_export_header(CurveFitting FALSE) generate_mantid_export_header(CurveFitting FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidCurveFittingTargets") set(TARGET_EXPORT_NAME "MantidCurveFittingTargets")
mtd_install_dylib(TARGETS CurveFitting INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS CurveFitting INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake CurveFitting
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${PLUGINS_DIR}
) ${WORKBENCH_PLUGINS_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/DataHandling/CMakeLists.txt
View file @ 6b298607
...@@ -712,11 +712,13 @@ endif() ...@@ -712,11 +712,13 @@ endif()
add_subdirectory(test) add_subdirectory(test)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidDataHandlingTargets") set(TARGET_EXPORT_NAME "MantidDataHandlingTargets")
mtd_install_dylib(TARGETS DataHandling EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS DataHandling EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake DataHandling
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${PLUGINS_DIR}
) ${WORKBENCH_PLUGINS_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/DataObjects/CMakeLists.txt
View file @ 6b298607
...@@ -257,11 +257,13 @@ target_link_libraries(DataObjects PUBLIC Mantid::API Mantid::Geometry Mantid::Hi ...@@ -257,11 +257,13 @@ target_link_libraries(DataObjects PUBLIC Mantid::API Mantid::Geometry Mantid::Hi
add_subdirectory(test) add_subdirectory(test)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidDataObjectsTargets") set(TARGET_EXPORT_NAME "MantidDataObjectsTargets")
mtd_install_dylib(TARGETS DataObjects EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS DataObjects EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake DataObjects
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${LIB_DIR}
) ${WORKBENCH_LIB_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/Geometry/CMakeLists.txt
View file @ 6b298607
...@@ -523,11 +523,14 @@ target_include_directories(Geometry PUBLIC ...@@ -523,11 +523,14 @@ target_include_directories(Geometry PUBLIC
) )
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidGeometryTargets") set(TARGET_EXPORT_NAME "MantidGeometryTargets")
mtd_install_dylib(TARGETS Geometry EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Geometry EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
Geometry
INSTALL_DIRS
${LIB_DIR}
${WORKBENCH_LIB_DIR})
endif()
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
\ No newline at end of file
Framework/HistogramData/CMakeLists.txt
View file @ 6b298607
...@@ -150,11 +150,14 @@ target_include_directories(HistogramData PUBLIC ...@@ -150,11 +150,14 @@ target_include_directories(HistogramData PUBLIC
generate_mantid_export_header(HistogramData FALSE) generate_mantid_export_header(HistogramData FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidHistogramDataTargets") set(TARGET_EXPORT_NAME "MantidHistogramDataTargets")
mtd_install_dylib(TARGETS HistogramData INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS HistogramData INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
HistogramData
INSTALL_DIRS
${LIB_DIR}
${WORKBENCH_LIB_DIR})
endif()
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
\ No newline at end of file
Framework/ICat/CMakeLists.txt
View file @ 6b298607
...@@ -120,12 +120,14 @@ target_include_directories(ICat PUBLIC ...@@ -120,12 +120,14 @@ target_include_directories(ICat PUBLIC
generate_mantid_export_header(ICat True) generate_mantid_export_header(ICat True)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidICatTargets") set(TARGET_EXPORT_NAME "MantidICatTargets")
mtd_install_dylib(TARGETS ICat INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS ICat INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake ICat
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${PLUGINS_DIR}
) ${WORKBENCH_PLUGINS_DIR})
endif()
Framework/Indexing/CMakeLists.txt
View file @ 6b298607
...@@ -105,11 +105,14 @@ target_include_directories(Indexing PUBLIC ...@@ -105,11 +105,14 @@ target_include_directories(Indexing PUBLIC
generate_mantid_export_header(Indexing TRUE) generate_mantid_export_header(Indexing TRUE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidIndexingTargets") set(TARGET_EXPORT_NAME "MantidIndexingTargets")
mtd_install_dylib(TARGETS Indexing INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Indexing INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
Indexing
INSTALL_DIRS
${LIB_DIR}
${WORKBENCH_LIB_DIR})
endif()
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
Framework/Json/CMakeLists.txt
View file @ 6b298607
...@@ -43,18 +43,6 @@ target_include_directories(Json PUBLIC ...@@ -43,18 +43,6 @@ target_include_directories(Json PUBLIC
generate_mantid_export_header(Json FALSE) generate_mantid_export_header(Json FALSE)
# Installation settings
set(TARGET_EXPORT_NAME "MantidJsonTargets")
mtd_install_dylib(TARGETS Json INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR})
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
if(CXXTEST_FOUND) if(CXXTEST_FOUND)
cxxtest_add_test(JsonTest ${TEST_FILES}) cxxtest_add_test(JsonTest ${TEST_FILES})
...@@ -67,3 +55,15 @@ add_dependencies(FrameworkTests JsonTest) ...@@ -67,3 +55,15 @@ add_dependencies(FrameworkTests JsonTest)
set_property(TARGET JsonTest PROPERTY FOLDER "UnitTests") set_property(TARGET JsonTest PROPERTY FOLDER "UnitTests")
endif() endif()
# Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidJsonTargets")
mtd_install_framework_lib(TARGETS Json INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
Json
INSTALL_DIRS
${LIB_DIR}
${WORKBENCH_LIB_DIR})
endif()
Framework/Kernel/CMakeLists.txt
View file @ 6b298607
...@@ -614,16 +614,6 @@ else() ...@@ -614,16 +614,6 @@ else()
${CMAKE_CURRENT_BINARY_DIR}/Mantid.properties.config) ${CMAKE_CURRENT_BINARY_DIR}/Mantid.properties.config)
endif() endif()
# Installation settings
set(TARGET_EXPORT_NAME "MantidKernelTargets")
mtd_install_dylib(TARGETS Kernel EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR})
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
# Create the properties file for the installer # Create the properties file for the installer
set(MANTID_ROOT_BUILD ${MANTID_ROOT}) set(MANTID_ROOT_BUILD ${MANTID_ROOT})
...@@ -663,3 +653,10 @@ mtd_install_files(FILES ${CMAKE_CURRENT_BINARY_DIR}/Mantid.properties.install ...@@ -663,3 +653,10 @@ mtd_install_files(FILES ${CMAKE_CURRENT_BINARY_DIR}/Mantid.properties.install
INSTALL_DIRS ${BIN_DIR} ${WORKBENCH_BIN_DIR} INSTALL_DIRS ${BIN_DIR} ${WORKBENCH_BIN_DIR}
RENAME Mantid.properties) RENAME Mantid.properties)
# Installation settings
if(CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidKernelTargets")
mtd_install_framework_lib(TARGETS Kernel EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS Kernel INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR})
endif()
\ No newline at end of file
Framework/LiveData/CMakeLists.txt
View file @ 6b298607
...@@ -153,11 +153,14 @@ target_include_directories(LiveData PUBLIC ...@@ -153,11 +153,14 @@ target_include_directories(LiveData PUBLIC
generate_mantid_export_header(LiveData FALSE) generate_mantid_export_header(LiveData FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidLiveDataTargets") set(TARGET_EXPORT_NAME "MantidLiveDataTargets")
mtd_install_dylib(TARGETS LiveData INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS LiveData INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
LiveData
INSTALL_DIRS
${PLUGINS_DIR}
${WORKBENCH_PLUGINS_DIR})
endif()
install(EXPORT ${TARGET_EXPORT_NAME}
FILE ${TARGET_EXPORT_NAME}.cmake
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
\ No newline at end of file
Framework/MDAlgorithms/CMakeLists.txt
View file @ 6b298607
...@@ -399,8 +399,16 @@ target_link_libraries(MDAlgorithms PUBLIC Mantid::API Mantid::DataObjects Mantid ...@@ -399,8 +399,16 @@ target_link_libraries(MDAlgorithms PUBLIC Mantid::API Mantid::DataObjects Mantid
add_subdirectory(test) add_subdirectory(test)
# Installation settings # Installation settings
mtd_install_dylib(TARGETS if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidMDAlgorithmsTargets")
mtd_install_framework_lib(TARGETS
MDAlgorithms
EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
mtd_install_targets(TARGETS
MDAlgorithms MDAlgorithms
INSTALL_DIRS INSTALL_DIRS
${PLUGINS_DIR} ${PLUGINS_DIR}
${WORKBENCH_PLUGINS_DIR}) ${WORKBENCH_PLUGINS_DIR})
endif()
Framework/MPIAlgorithms/CMakeLists.txt
View file @ 6b298607
...@@ -36,7 +36,7 @@ target_link_libraries(MPIAlgorithms PUBLIC Mantid::API Mantid::DataObjects PRIVA ...@@ -36,7 +36,7 @@ target_link_libraries(MPIAlgorithms PUBLIC Mantid::API Mantid::DataObjects PRIVA
add_subdirectory(test) add_subdirectory(test)
# Installation settings # Installation settings
mtd_install_dylib(TARGETS mtd_install_targets(TARGETS
MPIAlgorithms MPIAlgorithms
INSTALL_DIRS INSTALL_DIRS
${PLUGINS_DIR} ${PLUGINS_DIR}
......
Framework/Muon/CMakeLists.txt
View file @ 6b298607
...@@ -120,11 +120,13 @@ target_include_directories(Muon PUBLIC ...@@ -120,11 +120,13 @@ target_include_directories(Muon PUBLIC
generate_mantid_export_header(Muon FALSE) generate_mantid_export_header(Muon FALSE)
# Installation settings # Installation settings
if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidMuonTargets") set(TARGET_EXPORT_NAME "MantidMuonTargets")
mtd_install_dylib(TARGETS Muon INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Muon INSTALL_EXPORT_FILE EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS
FILE ${TARGET_EXPORT_NAME}.cmake Muon
NAMESPACE Mantid:: INSTALL_DIRS
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework ${PLUGINS_DIR}
) ${WORKBENCH_PLUGINS_DIR})
\ No newline at end of file endif()
\ No newline at end of file
Framework/Nexus/CMakeLists.txt
View file @ 6b298607
...@@ -48,12 +48,9 @@ target_link_libraries(Nexus PUBLIC Mantid::API Mantid::DataObjects Mantid::Kerne ...@@ -48,12 +48,9 @@ target_link_libraries(Nexus PUBLIC Mantid::API Mantid::DataObjects Mantid::Kerne
add_subdirectory(test) add_subdirectory(test)
# Installation settings # Installation settings
# Installation settings if (CONDA_BUILD)
set(TARGET_EXPORT_NAME "MantidNexusTargets") set(TARGET_EXPORT_NAME "MantidNexusTargets")
mtd_install_dylib(TARGETS Nexus EXPORT_NAME ${TARGET_EXPORT_NAME} INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR}) mtd_install_framework_lib(TARGETS Nexus EXPORT_NAME ${TARGET_EXPORT_NAME})
else()
install(EXPORT ${TARGET_EXPORT_NAME} mtd_install_targets(TARGETS Nexus INSTALL_DIRS ${LIB_DIR} ${WORKBENCH_LIB_DIR})
FILE ${TARGET_EXPORT_NAME}.cmake endif()
NAMESPACE Mantid::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MantidFramework
)
\ No newline at end of file
Markdown is supported
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