Browse Source

cmake: make sure VARIABLE of check_linker_supports_version_file ends up in cache

Anonymous Maarten 1 month ago
parent
commit
5ad12c47dc
3 changed files with 5 additions and 5 deletions
  1. 1 1
      cmake/PreseedEmscriptenCache.cmake
  2. 1 1
      cmake/PreseedNokiaNGageCache.cmake
  3. 3 3
      cmake/macros.cmake

+ 1 - 1
cmake/PreseedEmscriptenCache.cmake

@@ -153,7 +153,7 @@ if(EMSCRIPTEN)
     set(HAVE_O_CLOEXEC                                   "1"   CACHE INTERNAL "Test HAVE_O_CLOEXEC")
     set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR             "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR")
     set(COMPILER_SUPPORTS_GCC_ATOMICS                    "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_GCC_ATOMICS")
-    set(LINKER_SUPPORTS_VERSION_SCRIPT                   ""    CACHE INTERNAL "Test LINKER_SUPPORTS_VERSION_SCRIPT")
+    set(HAVE_WL_VERSION_SCRIPT                           ""    CACHE INTERNAL "Test HAVE_WL_VERSION_SCRIPT")
     set(LINKER_SUPPORTS_WL_NO_UNDEFINED                  ""    CACHE INTERNAL "Test LINKER_SUPPORTS_WL_NO_UNDEFINED")
     set(ICONV_IN_LIBC                                    "1"   CACHE INTERNAL "Test ICONV_IN_LIBC")
     set(ICONV_IN_LIBICONV                                ""    CACHE INTERNAL "Test ICONV_IN_LIBICONV")

+ 1 - 1
cmake/PreseedNokiaNGageCache.cmake

@@ -155,7 +155,7 @@ if(NGAGESDK)
     #set(HAVE_O_CLOEXEC                                   ""    CACHE INTERNAL "Test HAVE_O_CLOEXEC")
     #set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR             ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR")
     set(COMPILER_SUPPORTS_GCC_ATOMICS                    ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_GCC_ATOMICS")
-    set(LINKER_SUPPORTS_VERSION_SCRIPT                   ""    CACHE INTERNAL "Test LINKER_SUPPORTS_VERSION_SCRIPT")
+    set(HAVE_WL_VERSION_SCRIPT                           ""    CACHE INTERNAL "Test HAVE_WL_VERSION_SCRIPT")
     set(LINKER_SUPPORTS_WL_NO_UNDEFINED                  ""    CACHE INTERNAL "Test LINKER_SUPPORTS_WL_NO_UNDEFINED")
     set(ICONV_IN_LIBC                                    ""    CACHE INTERNAL "Test ICONV_IN_LIBC")
     set(ICONV_IN_LIBICONV                                ""    CACHE INTERNAL "Test ICONV_IN_LIBICONV")

+ 3 - 3
cmake/macros.cmake

@@ -296,15 +296,15 @@ endfunction()
 function(check_linker_supports_version_file VAR)
   SDL_detect_linker()
   if(CMAKE_C_COMPILER_LINKER_ID MATCHES "^(MSVC)$")
-    set(LINKER_SUPPORTS_VERSION_SCRIPT FALSE)
+    set(${VAR} FALSE)
   else()
     cmake_push_check_state(RESET)
     file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/dummy.sym" "n_0 {\n global:\n  func;\n local: *;\n};\n")
     list(APPEND CMAKE_REQUIRED_LINK_OPTIONS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/dummy.sym")
-    check_c_source_compiles("int func(void) {return 0;} int main(int argc,char*argv[]){(void)argc;(void)argv;return func();}" LINKER_SUPPORTS_VERSION_SCRIPT FAIL_REGEX "(unsupported|syntax error|unrecognized option)")
+    check_c_source_compiles("int func(void) {return 0;} int main(int argc,char*argv[]){(void)argc;(void)argv;return func();}" ${VAR} FAIL_REGEX "(unsupported|syntax error|unrecognized option)")
     cmake_pop_check_state()
   endif()
-  set(${VAR} "${LINKER_SUPPORTS_VERSION_SCRIPT}" PARENT_SCOPE)
+  set(${VAR} "${${VAR}}" PARENT_SCOPE)
 endfunction()
 
 if(CMAKE_VERSION VERSION_LESS 3.18)