Replace loader_cmake_config.h with definitions

Use CMakes built in ability to define compiler definitions to targets so that
the loader_cmake_config.h file is made redundant. This simplifies the build
process by removing the configure_file and including it. Note that this
commit is a part of a series of commits and not intended to work by itself.

diff --git a/BUILD.gn b/BUILD.gn
index 08df4aef2ba7f3182638eb8944aa044a37fb56b0..dc1f8720ce3e6e78c7091e4c2ad274643d2c76a3 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,7 +37,6 @@ if (is_win) {
 
 config("vulkan_internal_config") {
   defines = [
-    "VULKAN_NON_CMAKE_BUILD",
     "VK_ENABLE_BETA_EXTENSIONS",
   ]
   if (is_clang || !is_win) {

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 6ab7813f381e6054d97a1688eeb568feeaa2272b..acea3da5e43153aee81aafe367d3a98434403e53 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -30,10 +30,16 @@ include(CheckIncludeFile)
 
 check_function_exists(secure_getenv HAVE_SECURE_GETENV)
 check_function_exists(__secure_getenv HAVE___SECURE_GETENV)
-if(NOT (HAVE_SECURE_GETENV OR HAVE__SECURE_GETENV))
+
+if (HAVE_SECURE_GETENV)
+    target_compile_definitions(loader_specific_options INTERFACE HAVE_SECURE_GETENV)
+endif()
+if (HAVE___SECURE_GETENV)
+    target_compile_definitions(loader_specific_options INTERFACE HAVE___SECURE_GETENV)
+endif()
+if(NOT (HAVE_SECURE_GETENV OR HAVE___SECURE_GETENV))
     message(WARNING "Using non-secure environmental lookups. This loader will not properly disable environent variables when run with elevated permissions.")
 endif()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/loader_cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/loader_cmake_config.h)
 
 if(WIN32)
     if(MSVC AND NOT MSVC_VERSION LESS 1900)

diff --git a/loader/get_environment.c b/loader/get_environment.c
index bf878dab7bf206653ed8723de8ecbc35c041d14e..10a3ddf404315f6a76c1c413d41ca9d0187bd575 100644 (file)
--- a/loader/get_environment.c
+++ b/loader/get_environment.c
@@ -30,12 +30,6 @@
 
 #include "log.h"
 
-// This is a CMake generated file with #defines for if secure_getenv and __secure_getenv
-// are present.
-#if !defined(VULKAN_NON_CMAKE_BUILD)
-#include "loader_cmake_config.h"
-#endif  // !defined(VULKAN_NON_CMAKE_BUILD)
-
 // Environment variables
 #if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
 

diff --git a/loader/loader_cmake_config.h.in b/loader/loader_cmake_config.h.in
deleted file mode 100644 (file)
index 3bbc461..0000000
--- a/loader/loader_cmake_config.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#cmakedefine HAVE_SECURE_GETENV
-#cmakedefine HAVE___SECURE_GETENV