From b016452a06323e72778ad0cfda1d8d692f58b52a Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Thu, 10 Oct 2019 15:00:09 +0200 Subject: [PATCH] adjust cmake files to changed filesystem --- CMakeLists.txt | 2 +- src/gui/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aa0bb0..842ff8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ if(KIMA2_USE_EXTERNAL_JSON) find_package(nlohmann_json REQUIRED) endif() -add_subdirectory(3rdparty) +add_subdirectory(subprojects) add_subdirectory(src) #if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 8992f6f..3f62bef 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -33,13 +33,13 @@ set(GUI_SOURCES settingsdialog.cpp settingsdialog.ui ../../kima2.qrc - ${PROJECT_SOURCE_DIR}/3rdparty/singleapplication/singleapplication.cpp - ${PROJECT_SOURCE_DIR}/3rdparty/singleapplication/singleapplication_p.cpp + ${PROJECT_SOURCE_DIR}/subprojects/singleapplication/singleapplication.git/singleapplication.cpp + ${PROJECT_SOURCE_DIR}/subprojects/singleapplication/singleapplication.git/singleapplication_p.cpp ) add_executable(kima2 ${GUI_SOURCES} kima2.rc) target_include_directories(kima2 PRIVATE ${PROJECT_BINARY_DIR}) -target_include_directories(kima2 PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/singleapplication) +target_include_directories(kima2 PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/singleapplication/singleapplication.git) target_link_libraries(kima2 core printer Qt5::Widgets Qt5::PrintSupport Qt5::Network stdc++fs) if(WIN32) set_target_properties(kima2 PROPERTIES LINK_FLAGS "-mwindows")