From 1e635fc7bb147b3942411f5d9516ff6ef865a4e8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Dec 2021 15:09:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- src/myx/backports/compiler/CMakeLists.txt | 4 ---- src/myx/backports/cpp/CMakeLists.txt | 4 ---- src/myx/backports/qt/CMakeLists.txt | 4 ---- src/myx/core/CMakeLists.txt | 4 ---- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54db24f..f633b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT DEFINED MYXLIB_MASTER_PROJECT) endif() endif() -find_package(MyxCMake 0.4.1 REQUIRED) +find_package(MyxCMake 0.4.4 REQUIRED) #cmlib_set_cxx_standard(11) option(MYXLIB_BUILD_EXAMPLES "Build examples" OFF) diff --git a/src/myx/backports/compiler/CMakeLists.txt b/src/myx/backports/compiler/CMakeLists.txt index 9a30157..000a5c6 100644 --- a/src/myx/backports/compiler/CMakeLists.txt +++ b/src/myx/backports/compiler/CMakeLists.txt @@ -19,7 +19,3 @@ target_sources(${TRGT} INTERFACE ${TRGT_cpp} ${TRGT_headers}) 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}/backports/compiler) - -# Цель, используемая только для установки заголовочных файлов без компиляции проекта -add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P - "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/backports/cpp/CMakeLists.txt b/src/myx/backports/cpp/CMakeLists.txt index 22fdee3..adfb36f 100644 --- a/src/myx/backports/cpp/CMakeLists.txt +++ b/src/myx/backports/cpp/CMakeLists.txt @@ -20,7 +20,3 @@ target_sources(${TRGT} INTERFACE ${TRGT_cpp} ${TRGT_headers}) 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}/backports/cpp) - -# Цель, используемая только для установки заголовочных файлов без компиляции проекта -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/backports/qt/CMakeLists.txt b/src/myx/backports/qt/CMakeLists.txt index a786788..1b2ad29 100644 --- a/src/myx/backports/qt/CMakeLists.txt +++ b/src/myx/backports/qt/CMakeLists.txt @@ -19,7 +19,3 @@ target_sources(${TRGT} INTERFACE ${TRGT_cpp} ${TRGT_headers}) install(FILES ${TRGT_headers} COMPONENT dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/backports/qt) myx_cmake_generate_pkgconfig(${TRGT} BASENAME myx-${TRGT} INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES}) - -# Цель, используемая только для установки заголовочных файлов без компиляции проекта -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/core/CMakeLists.txt b/src/myx/core/CMakeLists.txt index 54fe89a..760e76c 100644 --- a/src/myx/core/CMakeLists.txt +++ b/src/myx/core/CMakeLists.txt @@ -24,7 +24,3 @@ target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src) 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")