Compare commits

...

4 Commits

Author SHA1 Message Date
d6d9bf7570 2.4.40 2024-04-12 13:00:06 +03:00
a42482170f 2.4.40 2024-04-12 12:58:23 +03:00
57269a7660 Совместимость с новыми версиям MyxCMake 2024-04-12 12:57:52 +03:00
62ad3b66c4 PVS 2024-04-12 12:57:09 +03:00
8 changed files with 21 additions and 21 deletions

View File

@ -36,4 +36,4 @@ upload:
-a $(BUILD_DIR)/myxx-cmake_$(V)_all.deb \ -a $(BUILD_DIR)/myxx-cmake_$(V)_all.deb \
-a $(BUILD_DIR)/myxx-cmake-local-$(V).tar.xz -a $(BUILD_DIR)/myxx-cmake-local-$(V).tar.xz
git tag -d $(V) git tag -d $(V)
git push git push --all

View File

@ -3,7 +3,7 @@ cmake_policy(SET CMP0057 NEW) # IN_LIST operator
get_filename_component(MYXX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) get_filename_component(MYXX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
if(NOT MyxCMake_DIR) if(NOT MYX_CMAKE_DIR)
message(FATAL_ERROR "MyxxCMake library required MyxCMake to work") message(FATAL_ERROR "MyxxCMake library required MyxCMake to work")
endif() endif()

View File

@ -1,4 +1,4 @@
set(MYXX_CMAKE_PACKAGE_VERSION "2.4.34") set(MYXX_CMAKE_PACKAGE_VERSION "2.4.40")
if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) if(MYXX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()

View File

@ -39,12 +39,12 @@ function(myxx_analyze_pvs_studio TARGET_NAME)
set(ARG_MODE "GA:1,2,3;64:1,2;OP:1,2,3;CS:1,2;OWASP:1,2") set(ARG_MODE "GA:1,2,3;64:1,2;OP:1,2,3;CS:1,2;OWASP:1,2")
endif() endif()
get_target_property(__target_sources ${TARGET_NAME} SOURCES) get_target_property(target_src ${TARGET_NAME} SOURCES)
foreach(__iter ${__target_sources}) foreach(it ${target_src})
string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos) string(FIND ${it} ${CMAKE_BINARY_DIR} pos)
if(__pos EQUAL -1) if(pos EQUAL -1)
list(APPEND __filtered_sources ${__iter}) list(APPEND filtered_src ${it})
endif() endif()
endforeach() endforeach()
pvs_studio_add_target(TARGET ${TARGET_NAME}-analyze-pvs-studio pvs_studio_add_target(TARGET ${TARGET_NAME}-analyze-pvs-studio
@ -56,16 +56,16 @@ function(myxx_analyze_pvs_studio TARGET_NAME)
ARGS --exclude-path ${CMAKE_CURRENT_BINARY_DIR} ${ARG_ARGS} ARGS --exclude-path ${CMAKE_CURRENT_BINARY_DIR} ${ARG_ARGS}
MODE ${ARG_MODE}) MODE ${ARG_MODE})
get_target_property(__target_type ${TARGET_NAME} TYPE) get_target_property(target_type ${TARGET_NAME} TYPE)
if(${__target_type} STREQUAL INTERFACE_LIBRARY) if(${target_type} STREQUAL INTERFACE_LIBRARY)
set(__target_type INTERFACE) set(target_type INTERFACE)
else() else()
set(__target_type PRIVATE) set(target_type PRIVATE)
endif() endif()
if(MSVC) if(MSVC)
target_compile_options(${TARGET_NAME} BEFORE ${__target_type} /FI ${ARG_HEADER}) target_compile_options(${TARGET_NAME} BEFORE ${target_type} /FI ${ARG_HEADER})
else() # GCC/Clang else() # GCC/Clang
target_compile_options(${TARGET_NAME} BEFORE ${__target_type} -include ${ARG_HEADER}) target_compile_options(${TARGET_NAME} BEFORE ${target_type} -include ${ARG_HEADER})
endif() endif()
add_dependencies(${TARGET_NAME}-analyze-pvs-studio ${TARGET_NAME}) add_dependencies(${TARGET_NAME}-analyze-pvs-studio ${TARGET_NAME})

View File

@ -2,9 +2,9 @@
## Установка ## Установка
Скачать [пакет](../../../releases/download/2.4.34/myxx-cmake_2.4.34_all.deb) Скачать [пакет](../../../releases/download/2.4.40/myxx-cmake_2.4.40_all.deb)
для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.34_all.deb`, для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.40_all.deb`,
или [архив](../../../releases/download/2.4.34/myxx-cmake-local-2.4.34.tar.xz) или [архив](../../../releases/download/2.4.40/myxx-cmake-local-2.4.40.tar.xz)
и распаковать его в каталог `$HOME/.local/share/cmake`. и распаковать его в каталог `$HOME/.local/share/cmake`.
## Использование ## Использование

View File

@ -1 +1 @@
2.4.34 2.4.40

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR) cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
project(myxx-cmake VERSION 2.4.34 LANGUAGES) project(myxx-cmake VERSION 2.4.40 LANGUAGES)
include(GNUInstallDirs) include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake file(WRITE ${CMAKE_SOURCE_DIR}/MyxxCMake/MyxxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
myxx-cmake (2.4.34) unstable; urgency=medium myxx-cmake (2.4.40) unstable; urgency=medium
* New version. * New version.