浏览代码

Tests/CXXModules: replace the object extension as well

Ben Boeckel 2 年之前
父节点
当前提交
6b940dc590
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      Tests/RunCMake/CXXModules/check-json.cmake
  2. 1 0
      Tests/RunCMake/CXXModules/compiler_introspection.cmake

+ 1 - 0
Tests/RunCMake/CXXModules/check-json.cmake

@@ -15,6 +15,7 @@ function (json_placeholders in out)
   endif ()
   endif ()
   string(REPLACE "<SOURCE_DIR>" "${RunCMake_SOURCE_DIR}" in "${in}")
   string(REPLACE "<SOURCE_DIR>" "${RunCMake_SOURCE_DIR}" in "${in}")
   string(REPLACE "<BINARY_DIR>" "${RunCMake_TEST_BINARY_DIR}" in "${in}")
   string(REPLACE "<BINARY_DIR>" "${RunCMake_TEST_BINARY_DIR}" in "${in}")
+  string(REPLACE "<OBJEXT>" "${CMAKE_CXX_OUTPUT_EXTENSION}" in "${in}")
   set("${out}" "${in}" PARENT_SCOPE)
   set("${out}" "${in}" PARENT_SCOPE)
 endfunction ()
 endfunction ()
 
 

+ 1 - 0
Tests/RunCMake/CXXModules/compiler_introspection.cmake

@@ -21,6 +21,7 @@ set(CMAKE_CXX_COMPILE_FEATURES \"${CMAKE_CXX_COMPILE_FEATURES}\")
 set(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\")
 set(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\")
 set(forced_cxx_standard \"${forced_cxx_standard}\")
 set(forced_cxx_standard \"${forced_cxx_standard}\")
 set(CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\")
 set(CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\")
+set(CMAKE_CXX_OUTPUT_EXTENSION \"${CMAKE_CXX_OUTPUT_EXTENSION}\")
 ")
 ")
 
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}")