From f1604c556506fcfc0ae6c9c8fa21fb8c6a990d18 Mon Sep 17 00:00:00 2001 From: Tobias Ellinghaus Date: Sun, 24 Nov 2013 16:17:06 +0100 Subject: [PATCH] Allow compilation with colord and without squish Signed-off-by: Togan Muftuoglu --- src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a82c4ad..d7ed303 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -470,8 +470,6 @@ else(USE_GEO) message(STATUS "Map mode: disabled") endif(USE_GEO) -target_link_libraries(lib_darktable ${LIBS}) - # libcolord-gtk: if(USE_COLORD) find_package(Colord) @@ -496,11 +494,13 @@ if(USE_SQUISH) add_dependencies(lib_darktable squish) add_library(squish_static STATIC IMPORTED) set_target_properties(squish_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/squish/libsquish.a) -target_link_libraries(lib_darktable ${LIBS} squish_static) +target_link_libraries(lib_darktable squish_static) add_subdirectory(external/squish) add_definitions("-DHAVE_SQUISH") endif(USE_SQUISH) +target_link_libraries(lib_darktable ${LIBS}) + install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable) # make sure static libs is first list(INSERT LIBS 0 lib_darktable ${STATIC_LIBS}) -- 1.8.4.3