Compare commits
No commits in common. "d6d9bf7570788f339b67b7deb71ae68d5c781b1f" and "75cde136ba20975f4b3bdc79aa206de5bba3e0c3" have entirely different histories.
d6d9bf7570
...
75cde136ba
2
Makefile
2
Makefile
@ -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 --all
|
git push
|
||||||
|
@ -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 MYX_CMAKE_DIR)
|
if(NOT MyxCMake_DIR)
|
||||||
message(FATAL_ERROR "MyxxCMake library required MyxCMake to work")
|
message(FATAL_ERROR "MyxxCMake library required MyxCMake to work")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
set(MYXX_CMAKE_PACKAGE_VERSION "2.4.40")
|
set(MYXX_CMAKE_PACKAGE_VERSION "2.4.34")
|
||||||
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()
|
||||||
|
@ -39,11 +39,11 @@ 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_src ${TARGET_NAME} SOURCES)
|
get_target_property(__target_sources ${TARGET_NAME} SOURCES)
|
||||||
foreach(it ${target_src})
|
foreach(__iter ${__target_sources})
|
||||||
string(FIND ${it} ${CMAKE_BINARY_DIR} pos)
|
string(FIND ${__iter} ${CMAKE_BINARY_DIR} __pos)
|
||||||
if(pos EQUAL -1)
|
if(__pos EQUAL -1)
|
||||||
list(APPEND filtered_src ${it})
|
list(APPEND __filtered_sources ${__iter})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
@ -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})
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
## Установка
|
## Установка
|
||||||
|
|
||||||
Скачать [пакет](../../../releases/download/2.4.40/myxx-cmake_2.4.40_all.deb)
|
Скачать [пакет](../../../releases/download/2.4.34/myxx-cmake_2.4.34_all.deb)
|
||||||
для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.40_all.deb`,
|
для Debian и установить его, выполнив команду `sudo dpkg -i myxx-cmake_2.4.34_all.deb`,
|
||||||
или [архив](../../../releases/download/2.4.40/myxx-cmake-local-2.4.40.tar.xz)
|
или [архив](../../../releases/download/2.4.34/myxx-cmake-local-2.4.34.tar.xz)
|
||||||
и распаковать его в каталог `$HOME/.local/share/cmake`.
|
и распаковать его в каталог `$HOME/.local/share/cmake`.
|
||||||
|
|
||||||
## Использование
|
## Использование
|
||||||
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@ -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.40 LANGUAGES)
|
project(myxx-cmake VERSION 2.4.34 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
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
myxx-cmake (2.4.40) unstable; urgency=medium
|
myxx-cmake (2.4.34) unstable; urgency=medium
|
||||||
|
|
||||||
* New version.
|
* New version.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user