From 45a1f9cc1999ba9195d6fbe9a3f1f8feb273245d Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 7 Sep 2020 08:21:16 +0200 Subject: [PATCH] Fix #6461: Generate config.h after all subdirectories are parsed. --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fef59ede7..b6ecb116f 100644 --- 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")