Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 08:38:26 +00:00
Code Issues Releases Activity

Correct dependencies on generated header files

Browse Source 
This change corrects dependencies on generated defconfig.h and/or
convertconf.h header files because they must be generated before
compilation of conky.cc and main.cc if BUILD_BUILTIN_CONFIG and/or
BUILD_OLD_CONFIG are set.

Fixes: https://github.com/brndnmtthws/conky/issues/1118
This commit is contained in:
Petr Vaněk 2021-08-03 18:06:48 +02:00 committed by Brenden Matthews
parent b49ca7bbb1
commit b357b370c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/CMakeLists.txt
View File

@ -30,8 +30,7 @@ if(BUILD_BUILTIN_CONFIG)
${CMAKE_CURRENT_SOURCE_DIR}/${builtin_config} ${CMAKE_CURRENT_SOURCE_DIR}/${builtin_config}
defconfig.h defconfig defconfig.h defconfig
DEPENDS ${builtin_config}) DEPENDS ${builtin_config})
add_custom_target(defconfig ALL DEPENDS defconfig.h) set(generated_hdr_files ${generated_hdr_files} defconfig.h)
set_source_files_properties(defconfig.h PROPERTIES GENERATED TRUE)
endif(BUILD_BUILTIN_CONFIG) endif(BUILD_BUILTIN_CONFIG)
if(BUILD_OLD_CONFIG) if(BUILD_OLD_CONFIG)
@ -40,6 +39,7 @@ if(BUILD_OLD_CONFIG)
${CMAKE_SOURCE_DIR}/extras/convert.lua ${CMAKE_SOURCE_DIR}/extras/convert.lua
convertconf.h convertconf convertconf.h convertconf
DEPENDS ${CMAKE_SOURCE_DIR}/extras/convert.lua) DEPENDS ${CMAKE_SOURCE_DIR}/extras/convert.lua)
add_custom_target(convertconf ALL DEPENDS convertconf.h) set(generated_hdr_files ${generated_hdr_files} convertconf.h)
set_source_files_properties(convertconf.h PROPERTIES GENERATED TRUE)
endif(BUILD_OLD_CONFIG) endif(BUILD_OLD_CONFIG)
add_custom_target(generated_hdr_files DEPENDS ${generated_hdr_files})

3
src/CMakeLists.txt
View File

@ -295,8 +295,10 @@ endif(BUILD_HSV_GRADIENT)
if(BUILD_TESTS) if(BUILD_TESTS)
# Create a library strictly for testing # Create a library strictly for testing
add_library(conky_core ${conky_sources} ${optional_sources}) add_library(conky_core ${conky_sources} ${optional_sources})
add_dependencies(conky_core generated_hdr_files)
target_link_libraries(conky_core ${conky_libs}) target_link_libraries(conky_core ${conky_libs})
add_executable(conky main.cc) add_executable(conky main.cc)
add_dependencies(conky generated_hdr_files)
target_link_libraries(conky conky_core ${conky_libs}) target_link_libraries(conky conky_core ${conky_libs})
install(TARGETS conky_core install(TARGETS conky_core
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
@ -304,6 +306,7 @@ if(BUILD_TESTS)
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
else() else()
add_executable(conky main.cc ${conky_sources} ${optional_sources}) add_executable(conky main.cc ${conky_sources} ${optional_sources})
add_dependencies(conky generated_hdr_files)
target_link_libraries(conky ${conky_libs}) target_link_libraries(conky ${conky_libs})
endif() endif()