bug cmake: fix build breaking on second cmake configure run

7799dbc9676edf2bc963069a0f65ee159ee01dd1
userver-framework · May 26, 2024 · 6587c93 · 6587c93
1 parent c53e30e
commit 6587c93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -2,6 +2,9 @@ project(userver-samples CXX)
 
 add_custom_target(${PROJECT_NAME})
 
+# Imitate an installed userver in samples.
+file(WRITE "${CMAKE_BINARY_DIR}/package_stubs/userverConfig.cmake")
+
 add_subdirectory(config_service)
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-config_service)
 
@@ -95,3 +98,7 @@ if (USERVER_FEATURE_YDB AND USERVER_FEATURE_MONGODB)
   add_subdirectory(ydb_service)
   add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-ydb_service)
 endif()
+
+# Clean up fake userver installation above to avoid messing
+# with find_package(userver) in the parent project.
+file(REMOVE "${CMAKE_BINARY_DIR}/package_stubs/userverConfig.cmake")
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -379,10 +379,6 @@ write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/userverConfigVersion.cmake
   VERSION ${USERVER_VERSION} COMPATIBILITY SameMajorVersion
 )
-
-if (NOT USERVER_INSTALL)
-  set(userver_DIR "${CMAKE_CURRENT_BINARY_DIR}/" CACHE INTERNAL "")
-endif()
 
 _userver_directory_install(COMPONENT universal FILES
     "${CMAKE_CURRENT_BINARY_DIR}/userverConfig.cmake"