Fix #6461: Generate config.h after all subdirectories are parsed.

(cherry picked from commit 3310e388034d0271e06c175b78a99abf87011475)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97ba2f9..70dcd9e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -949,15 +949,14 @@ else()
        set(FREERDP_PROXY_PLUGINDIR "${PROXY_PLUGINDIR}")
 endif()
 
+# Declare we have config.h, generated later on.
+add_definitions("-DHAVE_CONFIG_H")
+
 # Include directories
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-# Configure files
-add_definitions("-DHAVE_CONFIG_H")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
 # RPATH configuration
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
@@ -1073,6 +1072,9 @@ if(WITH_SERVER)
        add_subdirectory(server)
 endif()
 
+# Configure files - Add last so all symbols are defined
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 # Packaging
 
 set(CMAKE_CPACK_INCLUDE_FILE "CMakeCPack.cmake")