Simplify cmake config chainloading

microsoft · Dec 31, 2024 · 20e73c2 · 20e73c2
1 parent 94404e8
commit 20e73c2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,9 +67,6 @@ elseif (UNIX)
 endif()
 message(STATUS "QUIC Platform: ${CX_PLATFORM}")
 
-set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
-set(SELF_DIR "$\{SELF_DIR\}")
-
 enable_testing()
 
 # Set the default TLS method for each platform.

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -269,7 +269,7 @@ else()
 endif()
 install(FILES ${PUBLIC_HEADERS} DESTINATION include)
 
-configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
+configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake @ONLY)
 
 install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION share/msquic)
 

diff --git a/src/bin/msquic-config.cmake.in b/src/bin/msquic-config.cmake.in
@@ -1,7 +1,6 @@
 include(CMakeFindDependencyMacro)
-@FILENAME_DEP_REPLACE@
 
-include(${SELF_DIR}/msquic.cmake)
+include("${CMAKE_CURRENT_LIST_DIR}/msquic.cmake")
 
 foreach(_t IN ITEMS msquic msquic_platform)
     if(TARGET msquic::${_t} AND NOT TARGET ${_t})