Skip to content

Commit 34933e0

Browse files
kuberrykuberry
authored
Merge pull request #174 from SNLComputation/cmake_fixup
Version 1.0.3
2 parents 8b5e9e9 + 83397b8 commit 34933e0

File tree

4 files changed

+77
-254
lines changed

4 files changed

+77
-254
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
cmake_minimum_required(VERSION 3.0.0)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0 FATAL_ERROR)
22

33
##########
44
#
55
# Compadre Details
66
#
77
##########
88

9-
PROJECT(Compadre VERSION 1.0.2 LANGUAGES CXX)
9+
PROJECT(Compadre VERSION 1.0.3 LANGUAGES CXX)
10+
1011

1112
# cmake helper functions
1213
include(${CMAKE_CURRENT_LIST_DIR}/cmake/bob.cmake)
@@ -24,7 +25,7 @@ SET(CMAKE_CXX_STANDARD 11)
2425
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
2526
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
2627
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
27-
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_RPATH})
28+
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_RPATH})
2829

2930
# RPATH should always include the folder it is called from
3031
bob_option(PYTHON_CALLING_BUILD "Python setuptools calling build" OFF)
@@ -365,7 +366,7 @@ if (Compadre_USE_PYTHON)
365366
ENDIF()
366367

367368
set(SWIG_PREFIX "../python") # relative to examples folder
368-
bob_input(GMLS_Module_DEST "lib/python/dist-packages" PATH "Path to install python module")
369+
bob_input(GMLS_Module_DEST "${CMAKE_INSTALL_LIBDIR}/python/dist-packages" PATH "Path to install python module")
369370

370371
IF(NOT EXISTS ${PYTHON_INCLUDE_DIRS})
371372
EXECUTE_PROCESS(

‎cmake/bob.cmake‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ function(bob_always_full_rpath)
3030
set(CMAKE_BUILD_WITH_INSTALL_RPATH False PARENT_SCOPE)
3131
# the RPATH to be used when installing, but only if it's not a system directory
3232
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
33-
"${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
33+
"${CMAKE_INSTALL_LIBDIR}" isSystemDir)
3434
if("${isSystemDir}" STREQUAL "-1")
35-
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" PARENT_SCOPE)
35+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" PARENT_SCOPE)
3636
endif()
3737
# add the automatically determined parts of the RPATH
3838
# which point to directories outside the build tree to the install RPATH
@@ -341,10 +341,10 @@ macro(bob_add_dependency)
341341
install(TARGETS ${tgt} EXPORT
342342
${tgt}-target
343343
RUNTIME DESTINATION bin
344-
ARCHIVE DESTINATION lib
345-
RUNTIME DESTINATION lib)
344+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
345+
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
346346
install(EXPORT ${tgt}-target
347-
DESTINATION lib/cmake/${PROJECT_NAME})
347+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
348348
set(${PROJECT_NAME}_EXPORTED_TARGETS
349349
${${PROJECT_NAME}_EXPORTED_TARGETS}
350350
${tgt})
@@ -390,11 +390,11 @@ function(bob_export_target tgt_name)
390390
install(TARGETS ${tgt_name} DESTINATION bin)
391391
else()
392392
if (USE_XSDK_DEFAULTS)
393-
install(TARGETS ${tgt_name} DESTINATION lib)
393+
install(TARGETS ${tgt_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
394394
else()
395-
install(TARGETS ${tgt_name} EXPORT ${tgt_name}-target DESTINATION lib)
395+
install(TARGETS ${tgt_name} EXPORT ${tgt_name}-target DESTINATION ${CMAKE_INSTALL_LIBDIR})
396396
install(EXPORT ${tgt_name}-target NAMESPACE ${PROJECT_NAME}::
397-
DESTINATION lib/cmake/${PROJECT_NAME})
397+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
398398
set(${PROJECT_NAME}_EXPORTED_TARGETS
399399
${${PROJECT_NAME}_EXPORTED_TARGETS} ${tgt_name} PARENT_SCOPE)
400400
endif()
@@ -516,15 +516,15 @@ function(bob_install_provenance)
516516
"${${PROJECT_NAME}_CMAKE_ARGS}")
517517
install(FILES
518518
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_cmake_args.txt
519-
DESTINATION lib/cmake/${PROJECT_NAME})
519+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
520520
get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)
521521
string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type_upper)
522522
foreach(lang IN LISTS languages)
523523
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${lang}_compile_line.txt
524524
"${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_FLAGS} ${CMAKE_${lang}_FLAGS_${build_type_upper}}")
525525
install(FILES
526526
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${lang}_compile_line.txt
527-
DESTINATION lib/cmake/${PROJECT_NAME})
527+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
528528
endforeach()
529529
foreach(tgt IN LISTS ${PROJECT_NAME}_EXPORTED_TARGETS)
530530
get_target_property(tgt_type "${tgt}" TYPE)
@@ -534,7 +534,7 @@ function(bob_install_provenance)
534534
"${link_libs}")
535535
install(FILES
536536
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${tgt}_libs.txt
537-
DESTINATION lib/cmake/${PROJECT_NAME})
537+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
538538
endif()
539539
endforeach()
540540

@@ -545,15 +545,15 @@ function(bob_install_provenance_no_recurse no_recurse_components_list)
545545
"${${PROJECT_NAME}_CMAKE_ARGS}")
546546
install(FILES
547547
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_cmake_args.txt
548-
DESTINATION lib/cmake/${PROJECT_NAME})
548+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
549549
get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)
550550
string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type_upper)
551551
foreach(lang IN LISTS languages)
552552
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${lang}_compile_line.txt
553553
"${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_FLAGS} ${CMAKE_${lang}_FLAGS_${build_type_upper}}")
554554
install(FILES
555555
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${lang}_compile_line.txt
556-
DESTINATION lib/cmake/${PROJECT_NAME})
556+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
557557
endforeach()
558558
foreach(tgt IN LISTS ${PROJECT_NAME}_EXPORTED_TARGETS)
559559
get_target_property(tgt_type "${tgt}" TYPE)
@@ -563,7 +563,7 @@ function(bob_install_provenance_no_recurse no_recurse_components_list)
563563
"${link_libs}")
564564
install(FILES
565565
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_${tgt}_libs.txt
566-
DESTINATION lib/cmake/${PROJECT_NAME})
566+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
567567
endif()
568568
endforeach()
569569

@@ -572,7 +572,7 @@ endfunction(bob_install_provenance_no_recurse)
572572
function(bob_end_package)
573573
include(CMakePackageConfigHelpers)
574574
set(INCLUDE_INSTALL_DIR include)
575-
set(LIB_INSTALL_DIR lib)
575+
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
576576
set(LATEST_FIND_DEPENDENCY
577577
"#The definition of this macro is really inconvenient prior to CMake
578578
#commit ab358d6a859d8b7e257ed1e06ca000e097a32ef6
@@ -654,7 +654,7 @@ set(${KEY_${TYPE}} \"${val}\")")
654654
")
655655
install(FILES
656656
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
657-
DESTINATION lib/cmake/${PROJECT_NAME})
657+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
658658
if(PROJECT_VERSION)
659659
file(WRITE
660660
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
@@ -665,15 +665,15 @@ set(${KEY_${TYPE}} \"${val}\")")
665665
COMPATIBILITY SameMajorVersion)
666666
install(FILES
667667
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
668-
DESTINATION lib/cmake/${PROJECT_NAME})
668+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
669669
endif()
670670
bob_install_provenance()
671671
endfunction(bob_end_package)
672672

673673
function(bob_end_package_no_recurse no_recurse_components_list)
674674
include(CMakePackageConfigHelpers)
675675
set(INCLUDE_INSTALL_DIR include)
676-
set(LIB_INSTALL_DIR lib)
676+
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
677677
set(LATEST_FIND_DEPENDENCY
678678
"#The definition of this macro is really inconvenient prior to CMake
679679
#commit ab358d6a859d8b7e257ed1e06ca000e097a32ef6
@@ -749,7 +749,7 @@ set(${KEY_${TYPE}} \"${val}\")")
749749
")
750750
install(FILES
751751
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
752-
DESTINATION lib/cmake/${PROJECT_NAME})
752+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
753753
if(PROJECT_VERSION)
754754
file(WRITE
755755
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
@@ -760,7 +760,7 @@ set(${KEY_${TYPE}} \"${val}\")")
760760
COMPATIBILITY SameMajorVersion)
761761
install(FILES
762762
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
763-
DESTINATION lib/cmake/${PROJECT_NAME})
763+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
764764
endif()
765765
bob_install_provenance_no_recurse("${no_recurse_components_list}")
766766
endfunction(bob_end_package_no_recurse)

0 commit comments

Comments
 (0)