From 7207a47a28e82abdab0251fe3d39e01395303334 Mon Sep 17 00:00:00 2001 From: DrSlony Date: Sat, 25 Oct 2014 17:00:00 +0200 Subject: [PATCH] Fix race condition involving version.h. So far affects Debian Testing and OpenBSD using Ninja. Issue 2446 --- rtengine/CMakeLists.txt | 2 ++ rtexif/CMakeLists.txt | 4 ++-- rtgui/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index 05bd4312c..796d5033d 100644 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -28,6 +28,8 @@ set (RTENGINESOURCEFILES safegtk.cc colortemp.cc curves.cc flatcurves.cc diagona include_directories (BEFORE "${CMAKE_CURRENT_BINARY_DIR}") add_library (rtengine ${RTENGINESOURCEFILES}) +add_dependencies (rtengine AboutFile) + #It may be nice to store library version too IF (BUILD_SHARED_LIBS) install (TARGETS rtengine DESTINATION ${LIBDIR}) diff --git a/rtexif/CMakeLists.txt b/rtexif/CMakeLists.txt index 54db707d5..a2e713ed7 100644 --- a/rtexif/CMakeLists.txt +++ b/rtexif/CMakeLists.txt @@ -1,5 +1,5 @@ -add_library (rtexif rtexif.cc stdattribs.cc nikonattribs.cc canonattribs.cc - pentaxattribs.cc fujiattribs.cc sonyminoltaattribs.cc olympusattribs.cc kodakattribs.cc) +add_library (rtexif rtexif.cc stdattribs.cc nikonattribs.cc canonattribs.cc pentaxattribs.cc fujiattribs.cc sonyminoltaattribs.cc olympusattribs.cc kodakattribs.cc) +add_dependencies (rtexif AboutFile) IF (WIN32) set_target_properties (rtexif PROPERTIES COMPILE_FLAGS " -ffast-math -fexpensive-optimizations") diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index 559e1ea0a..fa13d78ef 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -61,6 +61,7 @@ endif (WIN32) configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") add_executable (rth ${EXTRA_SRC} ${BASESOURCEFILES}) +add_dependencies (rth AboutFile) set_target_properties (rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee) #target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}