[packages/elektra.git] / elektra-jni.patch

cmake_push_check_state (RESET) resets also CMAKE_REQUIRED_INCLUDES, which are essential here

--- elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake.orig	2023-08-25 20:28:50.328127754 +0200
+++ elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake	2023-08-25 20:30:56.444111192 +0200
@@ -15,12 +15,14 @@ include (CMakePushCheckState)
 
 macro (safe_check_symbol_exists SYMBOL FILES VARIABLE)
 	set (CMAKE_C_FLAGS_OLD ${CMAKE_C_FLAGS})
+	set (SAVE_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
 	string (REPLACE "-Wpedantic" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
 
 	cmake_push_check_state ()
 	get_directory_property (DEFS COMPILE_DEFINITIONS)
 	prepend (DEFS "-D" ${DEFS})
 	list (APPEND CMAKE_REQUIRED_DEFINITIONS ${DEFS})
+	set (CMAKE_REQUIRED_INCLUDES ${SAVE_CMAKE_REQUIRED_INCLUDES})
 
 	check_symbol_exists ("${SYMBOL}" "${FILES}" "${VARIABLE}")
 	cmake_pop_check_state ()
Commit	Line	Data
e86f7c76 JB	1	cmake_push_check_state (RESET) resets also CMAKE_REQUIRED_INCLUDES, which are essential here
e86f7c76 JB	2
58b803e9 JB	3	--- elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake.orig 2023-08-25 20:28:50.328127754 +0200
	4	+++ elektra-0.9.14/scripts/cmake/Modules/SafeCheckSymbolExists.cmake 2023-08-25 20:30:56.444111192 +0200
	5	@@ -15,12 +15,14 @@ include (CMakePushCheckState)
e86f7c76 JB	6
	7	macro (safe_check_symbol_exists SYMBOL FILES VARIABLE)
	8	set (CMAKE_C_FLAGS_OLD ${CMAKE_C_FLAGS})
	9	+ set (SAVE_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
58b803e9 JB	10	string (REPLACE "-Wpedantic" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
	11
	12	cmake_push_check_state ()
	13	get_directory_property (DEFS COMPILE_DEFINITIONS)
e86f7c76	14	prepend (DEFS "-D" ${DEFS})
58b803e9	15	list (APPEND CMAKE_REQUIRED_DEFINITIONS ${DEFS})
e86f7c76 JB	16	+ set (CMAKE_REQUIRED_INCLUDES ${SAVE_CMAKE_REQUIRED_INCLUDES})
	17
	18	check_symbol_exists ("${SYMBOL}" "${FILES}" "${VARIABLE}")
58b803e9	19	cmake_pop_check_state ()