mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 3310e38803)
This commit is contained in:
Armin Novak 2020-09-07 08:21:16 +02:00 committed by akallabeth
parent 87f1ed1f2d
commit 3620916d29
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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")