Martchus
/
subdirs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it work with `CONFIGURATION_PACKAGE_SUFFIX…`

This commit is contained in:
Martchus 2021-08-07 18:41:22 +02:00
parent f3b12f90b4
commit 08a4a7ea09
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syncthingtray/CMakeLists.txt
View File

@ -6,12 +6,17 @@ enable_testing()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
message(STATUS "Adding c++utilities subdir")
add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
link_directories(${CPP_UTILITIES_BINARY_DIR})
message(STATUS "Adding qtutilities subdir")
add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
link_directories(${QT_UTILITIES_BINARY_DIR})
message(STATUS "Adding syncthingtray subdir")
add_subdirectory(${SUBDIRS_PREFIX}/syncthingtray syncthingtray)

4
tageditor/CMakeLists.txt
View File

@ -7,6 +7,7 @@ enable_testing()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
link_directories(${CPP_UTILITIES_BINARY_DIR})
@ -14,6 +15,7 @@ option(WIDGETS_GUI "enables/disables building the Qt Widgets GUI: yes (default)
option(QUICK_GUI "enables/disables building the Qt Quick GUI: yes (default) or no" ON)
if(WIDGETS_GUI OR QUICK_GUI)
add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
link_directories(${QT_UTILITIES_BINARY_DIR})
endif()
@ -21,11 +23,13 @@ endif()
option(ENABLE_JSON_EXPORT "enable JSON export" OFF)
if(ENABLE_JSON_EXPORT)
add_subdirectory(${SUBDIRS_PREFIX}/reflective-rapidjson reflective-rapidjson)
set(reflective-rapidjson${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/reflective-rapidjson")
list(APPEND CMAKE_MODULE_PATH ${REFLECTIVE_RAPIDJSON_SOURCE_DIR}/cmake/modules)
link_directories(${REFLECTIVE_RAPIDJSON_BINARY_DIR})
endif()
add_subdirectory(${SUBDIRS_PREFIX}/tagparser tagparser)
set(tagparser${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/tagparser")
link_directories(${TAG_PARSER_BINARY_DIR})
add_subdirectory(${SUBDIRS_PREFIX}/tageditor tageditor)