Skip to content

Commit 40c3367

Browse files
committed
Cleanup and remove *-config attempt
This failed, and there seems to be no good way around it. Consuming packages MUST manually append to their CMAKE_MODULE_PATH.
1 parent b7c74d6 commit 40c3367

File tree

2 files changed

+5
-80
lines changed

2 files changed

+5
-80
lines changed

CMakeLists.txt

Lines changed: 5 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,16 @@ project(rsp-cmake-scripts
4646
VERSION "${version_VERSION}"
4747
DESCRIPTION "A collection of CMake scripts for C++ projects"
4848
HOMEPAGE_URL "https://github.com/rsps/cmake-scripts"
49-
LANGUAGES "CXX"
49+
LANGUAGES NONE
5050
)
51+
set("${PROJECT_NAME}_VERSION" "${PROJECT_VERSION}")
52+
set("${PROJECT_NAME}_SEMVER" "${version_SEMVER}")
5153

5254
# Ensure parent project has modules and other properties available.
5355
if(NOT PROJECT_IS_TOP_LEVEL)
54-
# TODO: PROBLEM - works only if FetchContent is done from the top-level
55-
# TODO: CMakeLists.txt file - or this is pure luck, if it works!!!
56-
# When FetchContent_MakeAvailable() is used, in a top-level project,
57-
# this will work fine, for adding this project's module path(s).
5856
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
59-
60-
# TODO: But, if CPM is used for obtaining project, then this will sadly
61-
# TODO: not work.
62-
63-
# TODO: Possible Solution: We need to create pacakge config and version files:
64-
# TODO: @see https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#package-configuration-file
65-
# TODO: @see https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#command:configure_package_config_file
66-
67-
set("${PROJECT_NAME}_VERSION" "${PROJECT_VERSION}" PARENT_SCOPE)
68-
set("${PROJECT_NAME}_SEMVER" "${version_SEMVER}" PARENT_SCOPE)
57+
set("${PROJECT_NAME}_VERSION" "${${PROJECT_NAME}_VERSION}" PARENT_SCOPE)
58+
set("${PROJECT_NAME}_SEMVER" "${${PROJECT_NAME}_SEMVER}" PARENT_SCOPE)
6959
endif()
7060

7161
# -------------------------------------------------------------------------------------------------------------- #
@@ -114,57 +104,3 @@ endif ()
114104

115105
# output_ansi_demo()
116106
# dump(CMAKE_MODULE_PATH FOO BAR PROJECT_NAME)
117-
118-
# -------------------------------------------------------------------------------------------------------------- #
119-
# TODO: Package Configuration
120-
# -------------------------------------------------------------------------------------------------------------- #
121-
122-
include(GNUInstallDirs)
123-
include(CMakePackageConfigHelpers)
124-
125-
#install(
126-
# TARGETS "${PROJECT_NAME}"
127-
# EXPORT "${PROJECT_NAME}-export"
128-
## INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
129-
## RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
130-
## LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
131-
## ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
132-
#)
133-
#
134-
## Export cmake targets
135-
#install(
136-
# EXPORT "${PROJECT_NAME}-export"
137-
# FILE "${PROJECT_NAME}-targets.cmake"
138-
# NAMESPACE "${PROJECT_NAME}::"
139-
# DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
140-
#)
141-
142-
# Write config-version
143-
write_basic_package_version_file(
144-
${PROJECT_NAME}-config-version.cmake
145-
VERSION "${PROJECT_VERSION}"
146-
COMPATIBILITY SameMinorVersion
147-
)
148-
149-
# Configure installable cmake config
150-
configure_package_config_file(
151-
"${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
152-
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
153-
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/rsp/${PROJECT_NAME}"
154-
NO_SET_AND_CHECK_MACRO
155-
)
156-
157-
# Install config-version and config
158-
#install(
159-
# FILES
160-
# "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
161-
# "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
162-
# DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/rsp/${PROJECT_NAME}"
163-
#)
164-
165-
install(
166-
FILES
167-
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
168-
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
169-
DESTINATION "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}"
170-
)

cmake/rsp-cmake-scripts-config.cmake.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)