Skip to content

Commit fbdc201

Browse files
committed
Move CMake helper files to ./cmake
- OpenCoarraysConfig.cmake.in moved to `./cmake/pkg` - Updated cmake logic to be more robust against spaces, odd paths etc.
1 parent dbbf9d5 commit fbdc201

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,27 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
107107
add_subdirectory(src)
108108
add_subdirectory(install_prerequisites)
109109

110+
#-----------------------------------------------------
111+
# Publicize installed location to other CMake projects
112+
#-----------------------------------------------------
110113
install(EXPORT OpenCoarraysTargets
111114
NAMESPACE
112115
OpenCoarrays::
113116
DESTINATION
114117
lib/cmake/opencoarrays
115118
)
116-
include(CMakePackageConfigHelpers)
119+
include(CMakePackageConfigHelpers) # standard CMake module
117120
write_basic_package_version_file(
118121
"${CMAKE_CURRENT_BINARY_DIR}/OpenCoarraysConfigVersion.cmake"
119122
VERSION "${opencoarrays_VERSION}"
120123
COMPATIBILITY AnyNewerVersion
121124
)
122-
configure_file(OpenCoarraysConfig.cmake.in CMakeFiles/OpenCoarraysConfig.cmake @ONLY)
125+
configure_file("${CMAKE_SOURCE_DIR}/cmake/pkg/OpenCoarraysConfig.cmake.in"
126+
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/OpenCoarraysConfig.cmake" @ONLY)
123127

124128
install(
125129
FILES
126-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/OpenCoarraysConfig.cmake
130+
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/OpenCoarraysConfig.cmake"
127131
"${CMAKE_CURRENT_BINARY_DIR}/OpenCoarraysConfigVersion.cmake"
128132
DESTINATION
129133
lib/cmake/opencoarrays
File renamed without changes.

0 commit comments

Comments
 (0)