From 11cd1f7a44547c8cdca91c9190217a4350081a14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 27 Jul 2016 17:34:38 +0200 Subject: [PATCH] Add lib dirs, add qtutilities only when GUI enabled --- passwordmanager/CMakeLists.txt | 10 ++++++++-- tageditor/CMakeLists.txt | 10 ++++++++-- videodownloader/CMakeLists.txt | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/passwordmanager/CMakeLists.txt b/passwordmanager/CMakeLists.txt index 7f3ac75..9e8aea1 100644 --- a/passwordmanager/CMakeLists.txt +++ b/passwordmanager/CMakeLists.txt @@ -8,9 +8,15 @@ include_directories(BEFORE SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) +link_directories(${CPP_UTILITIES_BINARY_DIR}) -add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) -list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) +if(WIDGETS_GUI OR QUICK_GUI) + add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) + list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) + link_directories(${QT_UTILITIES_BINARY_DIR}) +endif() add_subdirectory(${SUBDIRS_PREFIX}/passwordfile passwordfile) +link_directories(${PASSWORD_FILE_BINARY_DIR}) + add_subdirectory(${SUBDIRS_PREFIX}/passwordmanager passwordmanager) diff --git a/tageditor/CMakeLists.txt b/tageditor/CMakeLists.txt index dce411e..e93c4b8 100644 --- a/tageditor/CMakeLists.txt +++ b/tageditor/CMakeLists.txt @@ -8,9 +8,15 @@ include_directories(BEFORE SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) +link_directories(${CPP_UTILITIES_BINARY_DIR}) -add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) -list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) +if(WIDGETS_GUI OR QUICK_GUI) + add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) + list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) + link_directories(${QT_UTILITIES_BINARY_DIR}) +endif() add_subdirectory(${SUBDIRS_PREFIX}/tagparser tagparser) +link_directories(${TAG_PARSER_BINARY_DIR}) + add_subdirectory(${SUBDIRS_PREFIX}/tageditor tageditor) diff --git a/videodownloader/CMakeLists.txt b/videodownloader/CMakeLists.txt index 253de70..39936de 100644 --- a/videodownloader/CMakeLists.txt +++ b/videodownloader/CMakeLists.txt @@ -8,8 +8,10 @@ include_directories(BEFORE SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules) +link_directories(${CPP_UTILITIES_BINARY_DIR}) add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities) list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules) +link_directories(${QT_UTILITIES_BINARY_DIR}) add_subdirectory(${SUBDIRS_PREFIX}/videodownloader videodownloader)