From ecc59526d19616125e0858e1628343d67d58afea Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Tue, 27 Dec 2022 08:02:20 +0300 Subject: [PATCH] removed unused common.cmake file --- service/CMakeLists.txt | 4 ---- service/common.cmake | 18 ------------------ service/src/qtservice.cmake | 2 -- 3 files changed, 24 deletions(-) delete mode 100644 service/common.cmake diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt index abde0c70..bfad3a3b 100644 --- a/service/CMakeLists.txt +++ b/service/CMakeLists.txt @@ -7,10 +7,6 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(NOT IOS AND NOT ANDROID) - #include(common.cmake) -#if (qtservice-uselib) -# add_subdirectory(buildlib) -#endif() add_subdirectory(server) endif() diff --git a/service/common.cmake b/service/common.cmake deleted file mode 100644 index 2d497e05..00000000 --- a/service/common.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(QTSERVICE_LIBNAME QtSolutions_Service-head) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(APPLE) - set(QTSERVICE_LIBNAME ${QTSERVICE_LIBNAME}_debug) - elseif(WIN32) - set(QTSERVICE_LIBNAME ${QTSERVICE_LIBNAME}_d) - endif() -endif() - -set(QTSERVICE_LIBDIR ${CMAKE_CURRENT_LIST_DIR}/lib) - -if(UNIX) - if(qtservice-uselib) - if(NOT qtservice-buildlib) - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${QTSERVICE_LIBDIR}) - endif() - endif() -endif() diff --git a/service/src/qtservice.cmake b/service/src/qtservice.cmake index 4a429fab..da4daa26 100644 --- a/service/src/qtservice.cmake +++ b/service/src/qtservice.cmake @@ -1,7 +1,5 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}) -#include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake) - if(NOT WIN32) set(LIBS ${LIBS} Qt6::Network) elseif(WIN32)