Skip to content

Commit c924cbc

Browse files
committed
Fix MSVC 2019 build in C++17 mode
Some set commands in CMake files did not work correctly because quotation is missing. It turns out set(A ${B}) does not set A to empty if B is empty. set(A "${B}") works also if B is empty.
1 parent 9d663b4 commit c924cbc

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cmake/FindCoroutines.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ if(find_final)
152152
check_include_file_cxx("coroutine" _CXX_COROUTINES_HAVE_HEADER)
153153
if(_CXX_COROUTINES_HAVE_HEADER)
154154
check_cxx_source_compiles("#include <coroutine> \n typedef std::suspend_never blub; \nint main() {} " _CXX_COROUTINES_FINAL_HEADER_COMPILES)
155-
set(_CXX_COROUTINES_HAVE_HEADER ${_CXX_COROUTINES_FINAL_HEADER_COMPILES})
155+
set(_CXX_COROUTINES_HAVE_HEADER "${_CXX_COROUTINES_FINAL_HEADER_COMPILES}")
156156
endif()
157157

158158
if(NOT _CXX_COROUTINES_HAVE_HEADER)
@@ -161,9 +161,9 @@ if(find_final)
161161
check_include_file_cxx("coroutine" _CXX_COROUTINES_HAVE_HEADER_WITH_FLAG)
162162
if(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG)
163163
check_cxx_source_compiles("#include <coroutine> \n typedef std::suspend_never blub; \nint main() {} " _CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG)
164-
set(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG ${_CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG})
164+
set(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG "${_CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG}")
165165
endif()
166-
set(_CXX_COROUTINES_HAVE_HEADER ${_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG})
166+
set(_CXX_COROUTINES_HAVE_HEADER "${_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG}")
167167
cmake_pop_check_state()
168168
endif()
169169
mark_as_advanced(_CXX_COROUTINES_HAVE_HEADER)
@@ -182,7 +182,7 @@ if(find_experimental)
182182
cmake_push_check_state()
183183
set(CMAKE_REQUIRED_FLAGS "${_CXX_COROUTINES_EXTRA_FLAGS}")
184184
check_include_file_cxx("experimental/coroutine" _CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG)
185-
set(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER ${_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG})
185+
set(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER "${_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG}")
186186
cmake_pop_check_state()
187187
endif()
188188
mark_as_advanced(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER)
@@ -256,7 +256,7 @@ if(CXX_COROUTINES_HAVE_COROUTINES)
256256
# Add the -fcoroutines-ts (or /await) flag
257257
set(CMAKE_REQUIRED_FLAGS "${_CXX_COROUTINES_EXTRA_FLAGS}")
258258
check_cxx_source_compiles("${code}" CXX_COROUTINES_AWAIT_NEEDED)
259-
set(can_link ${CXX_COROUTINES_AWAIT_NEEDED})
259+
set(can_link "${CXX_COROUTINES_AWAIT_NEEDED}")
260260
endif()
261261

262262
if(can_link)

0 commit comments

Comments
 (0)