Compare commits
No commits in common. "353d92da23a86c46128db3493e2f4a7f09ee16e0" and "ee00e43d25eb57b937b90685969c91707f7abd56" have entirely different histories.
353d92da23
...
ee00e43d25
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
project(myx-cmake VERSION 0.3.6 LANGUAGES)
|
||||
project(myx-cmake VERSION 0.3.4 LANGUAGES)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Подключение внешних проектов
|
||||
include(ExternalProject)
|
||||
|
||||
if(MPFR_FOUND AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/thirdparty/mpreal)
|
||||
if(MPFR_FOUND)
|
||||
ExternalProject_Add(
|
||||
mpfrcpp
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/mpreal
|
||||
@ -9,8 +9,7 @@ if(MPFR_FOUND AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/thirdparty/mpreal)
|
||||
CONFIGURE_COMMAND true
|
||||
BUILD_COMMAND true
|
||||
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/mpreal.h <INSTALL_DIR>)
|
||||
endif()
|
||||
|
||||
set(MPFRCPP_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE)
|
||||
set(MPFRCPP_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "" FORCE)
|
||||
endif()
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
function(myx_cmake_enable_high_precision_math)
|
||||
find_package(Quadmath)
|
||||
if(QUADMATH_FOUND)
|
||||
add_definitions(-DHAVE_QUADMATH=1)
|
||||
@ -10,4 +9,3 @@ function(myx_cmake_enable_high_precision_math)
|
||||
message(FATAL_ERROR "Nor Quadmath, nor MPFR found.")
|
||||
endif()
|
||||
endif()
|
||||
endfunction()
|
||||
|
@ -5,12 +5,11 @@ else()
|
||||
endif()
|
||||
|
||||
function(myx_cmake_analyze_pvs_studio target)
|
||||
if(EXISTS PVS_STUDIO_BIN_PATH AND EXISTS PVS_STUDIO_CONVERTER_PATH)
|
||||
set(options)
|
||||
set(oneValueArgs CHECKS)
|
||||
set(multiValueArgs)
|
||||
if(NOT TARGET myx-cmake-analyze-pvs-studio)
|
||||
set(PVS_STUDIO_HEADER "${CMAKE_BINARY_DIR}/include/myx_cmake_pvs_studio_header_p.hpp")
|
||||
set(PVS_STUDIO_HEADER "${CMAKE_BINARY_DIR}/include/myx_cmake_pvs_studio_header.hpp")
|
||||
file(WRITE ${PVS_STUDIO_HEADER}
|
||||
"#ifndef MYX_CMAKE_PVS_STUDIO_HEADER_HPP_\n"
|
||||
"#define MYX_CMAKE_PVS_STUDIO_HEADER_HPP_\n"
|
||||
@ -38,12 +37,11 @@ function(myx_cmake_analyze_pvs_studio target)
|
||||
else() # GCC/Clang
|
||||
target_compile_options(${target} BEFORE ${__target_type} -include ${PVS_STUDIO_HEADER})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(EXISTS PVS_STUDIO_BIN_PATH AND EXISTS PVS_STUDIO_CONVERTER_PATH AND TARGET myx-cmake-analyze-pvs-studio)
|
||||
add_dependencies(myx-cmake-analyze-pvs-studio ${target})
|
||||
get_target_property(__target_source_dir "${target}" SOURCE_DIR)
|
||||
pvs_studio_analyze_target("${target}" "${__target_source_dir}")
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "MyxCMake: pvs-studio-analyzer not found.")
|
||||
endif()
|
||||
endfunction()
|
||||
|
@ -1,8 +1,4 @@
|
||||
function(myx_cmake_common_target_properties target)
|
||||
if(NOT TARGET ${target})
|
||||
message(FATAL_ERROR "MyxCMake: Target ${target} does not exists.")
|
||||
return()
|
||||
endif()
|
||||
get_target_property(_target_type ${target} TYPE)
|
||||
|
||||
set(__visibility PUBLIC)
|
||||
|
@ -12,7 +12,7 @@ popd
|
||||
cp -ap debian "$D/myx-cmake-$V"
|
||||
pushd "$D/myx-cmake-$V"
|
||||
dch -D unstable -v "${V}-1" -m "New version."
|
||||
debuild --no-sign
|
||||
debuild
|
||||
popd
|
||||
cp -f ${D}/myx*deb .
|
||||
|
||||
|
1
debian/compat
vendored
Normal file
1
debian/compat
vendored
Normal file
@ -0,0 +1 @@
|
||||
9
|
2
debian/control
vendored
2
debian/control
vendored
@ -2,7 +2,7 @@ Source: myx-cmake
|
||||
Section: utils
|
||||
Priority: optional
|
||||
Maintainer: Andrey Astafyev <dev@246060.ru>
|
||||
Build-Depends: debhelper (>= 9), debhelper-compat (= 9), cmake
|
||||
Build-Depends: debhelper (>= 9), cmake
|
||||
Standards-Version: 4.2.0
|
||||
|
||||
Package: myx-cmake
|
||||
|
5
debian/rules
vendored
5
debian/rules
vendored
@ -2,8 +2,3 @@
|
||||
|
||||
%:
|
||||
dh $@ --buildsystem=cmake
|
||||
|
||||
override_dh_fixperms:
|
||||
dh_fixperms
|
||||
find debian -name asan-wrapper -print0 | xargs -0 chmod +x
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user