From e0bb80be919a81be69ad9c7bc2a9863e9a80fc56 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 22 Apr 2020 21:13:36 +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=BA=20=D1=82=D0=B5=D0=BA=D1=83=D1=89?= =?UTF-8?q?=D0=B5=D0=BC=D1=83=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- cmake/cmlib | 2 +- cmake/etc/uncrustify | 2 +- src/cmlib-example/CMakeLists.txt | 10 +++------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f17659..c5ee250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ include(CMLibCommon) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_MULTITHREADED OFF) set(Boost_USE_STATIC_RUNTIME ON) -find_package(Boost 1.55.0 REQUIRED COMPONENTS headers) +find_package(Boost 1.55.0 REQUIRED) # Автоматически генерируемый заголовочный файл cmlib_config_hpp_generate() diff --git a/cmake/cmlib b/cmake/cmlib index 0b69005..197e5b3 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1 +Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e diff --git a/cmake/etc/uncrustify b/cmake/etc/uncrustify index eb34f3f..0cd764f 160000 --- a/cmake/etc/uncrustify +++ b/cmake/etc/uncrustify @@ -1 +1 @@ -Subproject commit eb34f3ffb32205b382c4ee56de890b5de9371fa7 +Subproject commit 0cd764fc187ab3b66cb31a5549f13b3336858894 diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt index 1c903dd..a71fe80 100644 --- a/src/cmlib-example/CMakeLists.txt +++ b/src/cmlib-example/CMakeLists.txt @@ -2,21 +2,17 @@ set(TRGT cmlib-example) # Список файлов исходных текстов -set(TRGT_sources ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) +set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) # Функция для создания цели, результатом которой будет сборка приложения -add_executable(${TRGT} ${TRGT_sources}) +add_executable(${TRGT} ${TRGT_cpp}) common_target_properties(${TRGT}) # Добавление к пути поиска заголовочных файлов target_include_directories(${TRGT} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) # Имя целевого каталога и выходного файла для цели -set_target_properties(${TRGT} - PROPERTIES - OUTPUT_NAME ${TRGT} - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} - ) +set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT}) # Правила для установки install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})