[CMAKE] Define HAVE_* constants unconditionally (follow-up to PR #2041) (#2052)

sys/types.h is guaranteed to be available on all our supported host platforms and always contains a pid_t definition.

diff --git a/sdk/include/host/CMakeLists.txt b/sdk/include/host/CMakeLists.txt
index 216e012..6513674 100644 (file)
--- a/sdk/include/host/CMakeLists.txt
+++ b/sdk/include/host/CMakeLists.txt
@@ -1,19 +1,3 @@
 
 

-include(CheckIncludeFile)
-include(CheckTypeSize)
-
-# check for <sys/types.h>
-CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-
-# check for pid_t definition
-if (HAVE_SYS_TYPES_H)
-    set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h")
-    #this sets HAVE_PID_T
-    CHECK_TYPE_SIZE("pid_t" PID_T)
-    unset(CMAKE_EXTRA_INCLUDE_FILES)
-endif()
-
-configure_file(config.h.in config.h @ONLY)
-

 add_library(host_includes INTERFACE)
 add_library(host_includes INTERFACE)

-target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/sdk/include/host/config.h.in b/sdk/include/host/config.h
similarity index 97%
rename from sdk/include/host/config.h.in
rename to sdk/include/host/config.h
index 5ba4eaa..4da9f3b 100644 (file)
--- a/sdk/include/host/config.h.in
+++ b/sdk/include/host/config.h
@@ -4,11 +4,12 @@
 #define __WINE_CONFIG_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define __WINE_CONFIG_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */

-#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
+#define HAVE_SYS_TYPES_H 1

 
 /* Define to 1 if the system has the type `pid_t'. */
 
 /* Define to 1 if the system has the type `pid_t'. */

-#cmakedefine HAVE_PID_T 1
+#define HAVE_PID_T 1

 
 

+/* Define to 1 if you have the `spawnvp' function. */

 #define HAVE_SPAWNVP 1
 
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_SPAWNVP 1
 
 /* Define to 1 if you have the `z' library (-lz). */