From 80be96219e7583d31573cdf32f174d6f50fa864e Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 5 Aug 2017 12:19:10 +0200 Subject: [PATCH] Fix source file dependency on config.h in engine --- src/engine/CMakeLists.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 4bf6addc2b..e2c54d8789 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -90,14 +90,6 @@ ADD_CUSTOM_COMMAND ( ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${ISO_4217_C} "${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c.xsl" "${CMAKE_CURRENT_SOURCE_DIR}/iso-4217-currencies.xml" ) ADD_CUSTOM_TARGET(iso-4217-c DEPENDS ${ISO_4217_C}) -# Add dependency on iso-4217-currencies.c -SET_SOURCE_FILES_PROPERTIES (gnc-commodity.c PROPERTIES OBJECT_DEPENDS "${ISO_4217_C};${CONFIG_H}") - -# Add dependency on config.h -SET_SOURCE_FILES_PROPERTIES (${libgncmod_engine_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H}) - -# Add dependency on swig-runtime.h -SET_SOURCE_FILES_PROPERTIES (gnc-hooks.c engine-helpers.c kvp-scm.cpp glib-helpers.c PROPERTIES OBJECT_DEPENDS "${CONFIG_H};${SWIG_RUNTIME_H}") SET (engine_SOURCES Account.c @@ -144,8 +136,18 @@ SET (engine_SOURCES gncVendor.c ) +# Add dependency on config.h +SET_SOURCE_FILES_PROPERTIES (${engine_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H}) -ADD_LIBRARY (gncmod-engine +# Add dependency on iso-4217-currencies.c +SET_SOURCE_FILES_PROPERTIES (gnc-commodity.c PROPERTIES OBJECT_DEPENDS "${ISO_4217_C};${CONFIG_H}") + +# Add dependency on swig-runtime.h +SET_SOURCE_FILES_PROPERTIES (gnc-hooks.c engine-helpers.c kvp-scm.cpp glib-helpers.c PROPERTIES OBJECT_DEPENDS "${CONFIG_H};${SWIG_RUNTIME_H}") + + + +ADD_LIBRARY (gncmod-engine ${engine_SOURCES} ${engine_HEADERS} ${SWIG_ENGINE_C} @@ -237,4 +239,4 @@ SET(engine_EXTRA_DIST ) SET_LOCAL_DIST(engine_DIST_local CMakeLists.txt Makefile.am ${engine_SOURCES} ${engine_HEADERS} ${engine_noinst_HEADERS} ${engine_SCHEME_0} ${engine_SCHEME_1} ${engine_EXTRA_DIST}) -SET(engine_DIST ${engine_DIST_local} ${engine_test_core_DIST} ${test_engine_DIST} PARENT_SCOPE) \ No newline at end of file +SET(engine_DIST ${engine_DIST_local} ${engine_test_core_DIST} ${test_engine_DIST} PARENT_SCOPE)