mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-30 18:29:37 -06:00
CMakePushCheckState: Fix cmake_push_check_state RESET argument
This option was added by commit v2.8.12~138^2 (Add cmake_reset_check_state() macro, 2013-07-28) but has never worked. Fix the implementation to refer to macro arguments properly (not as normal variables). Fixes: #17048
This commit is contained in:
@@ -62,7 +62,7 @@ macro(CMAKE_PUSH_CHECK_STATE)
|
||||
set(_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_FLAGS})
|
||||
set(_CMAKE_REQUIRED_QUIET_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_QUIET})
|
||||
|
||||
if (ARGC GREATER 0 AND ARGV0 STREQUAL "RESET")
|
||||
if (${ARGC} GREATER 0 AND "${ARGV0}" STREQUAL "RESET")
|
||||
cmake_reset_check_state()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
include(CMakePushCheckState)
|
||||
|
||||
set(CMAKE_EXTRA_INCLUDE_FILES file1)
|
||||
@@ -26,6 +27,27 @@ set(CMAKE_REQUIRED_LIBRARIES lib3)
|
||||
set(CMAKE_REQUIRED_FLAGS flag3)
|
||||
set(CMAKE_REQUIRED_QUIET 3)
|
||||
|
||||
cmake_push_check_state(RESET)
|
||||
|
||||
foreach(pair IN ITEMS
|
||||
EXTRA_INCLUDE_FILES|
|
||||
REQUIRED_INCLUDES|
|
||||
REQUIRED_DEFINITIONS|
|
||||
REQUIRED_LIBRARIES|
|
||||
REQUIRED_FLAGS|
|
||||
REQUIRED_QUIET|
|
||||
)
|
||||
string(REPLACE "|" ";" pair "${pair}")
|
||||
list(GET pair 0 var)
|
||||
list(GET pair 1 expected)
|
||||
if (NOT "${CMAKE_${var}}" STREQUAL "${expected}")
|
||||
set(fatal TRUE)
|
||||
message("ERROR: CMAKE_${var} is \"${CMAKE_${var}}\" (expected \"${expected}\")" )
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
cmake_pop_check_state()
|
||||
|
||||
cmake_pop_check_state()
|
||||
|
||||
foreach(pair IN ITEMS
|
||||
|
||||
Reference in New Issue
Block a user