From 6f2d2361fd4dc31611cd1eaf126eb43f959353b0 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Dec 2021 14:30:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B2?= =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D1=81=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D0=B8=D0=B5=D0=B9=20myx-cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- src/myx/filesystem/CMakeLists.txt | 5 +---- src/myx/qt/CMakeLists.txt | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42c1c85..54db24f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT DEFINED MYXLIB_MASTER_PROJECT) endif() endif() -find_package(MyxCMake 0.3.0 REQUIRED) +find_package(MyxCMake 0.4.1 REQUIRED) #cmlib_set_cxx_standard(11) option(MYXLIB_BUILD_EXAMPLES "Build examples" OFF) diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt index 61509b9..4362341 100644 --- a/src/myx/filesystem/CMakeLists.txt +++ b/src/myx/filesystem/CMakeLists.txt @@ -11,6 +11,7 @@ set(TRGT_hpp ${CMAKE_CURRENT_SOURCE_DIR}/paths.hpp) set(TRGT_headers ${TRGT_hpp}) # cmake-format: on +#add_library(${TRGT} ${TRGT_cpp} ${TRGT_headers}) add_library(${TRGT} OBJECT ${TRGT_cpp} ${TRGT_headers}) set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME myx-${TRGT}) myx_cmake_common_target_properties(${TRGT}) @@ -22,7 +23,3 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) myx_cmake_generate_pkgconfig(${TRGT} BASENAME myx-${TRGT} INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) install(FILES ${TRGT_headers} COMPONENT dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) - -# Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev -P - "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt index 3755b32..e216a99 100644 --- a/src/myx/qt/CMakeLists.txt +++ b/src/myx/qt/CMakeLists.txt @@ -43,7 +43,3 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) myx_cmake_generate_pkgconfig(${TRGT} BASENAME myx-${TRGT} INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) install(FILES ${TRGT_headers} COMPONENT dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT}) - -# Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev -P - "${CMAKE_BINARY_DIR}/cmake_install.cmake")