Skip to content

Commit 14bb75f

Browse files
authored
Update CMakeLists.txt
1 parent d2975d0 commit 14bb75f

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@ write_basic_package_version_file(
1919

2020
# For consumer using FetchContent
2121
if(NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
22-
# Trick to use the find_package
23-
configure_file(
24-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake" "${CMAKE_CURRENT_BINARY_DIR}/CPM.cmake" COPYONLY
25-
)
26-
set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}")
2722
# Check if the user download the repo with git and not in an official release
2823
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
2924
find_package(Git REQUIRED QUIET)
3025
# Generate a git-describe version string from Git repository tags.
3126
execute_process(
3227
COMMAND ${GIT_EXECUTABLE} tag --points-at HEAD
33-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
28+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3429
OUTPUT_VARIABLE CPM_TAG
3530
RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
3631
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -43,7 +38,7 @@ if(NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
4338
else()
4439
set(CPM_RELEASE TRUE)
4540
endif()
46-
find_package(CPM CONFIG REQUIRED NO_POLICY_SCOPE)
41+
include(cmake/CPM.cmake)
4742
endif()
4843

4944
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

0 commit comments

Comments
 (0)