diff --git a/CMakeLists.txt b/CMakeLists.txt index 29f41fb..e85ffad 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 32ca893..c4b1ca7 100644 --- a/src/cmlib-example/CMakeLists.txt +++ b/src/cmlib-example/CMakeLists.txt @@ -2,10 +2,10 @@ 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}) # Добавление к пути поиска заголовочных файлов @@ -22,11 +22,7 @@ target_include_directories(${TRGT} PUBLIC $