From c04c9900c6dfd1fe083dc6227f27a670e4b7a7de Mon Sep 17 00:00:00 2001 From: Andrei Astafev Date: Thu, 14 Sep 2023 14:44:47 +0300 Subject: [PATCH] 2.4.17 --- MyxCMake/MyxCMakeConfig.cmake | 3 --- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/Toolchains.cmake | 27 ++++++++++++++----- .../lib/toolchains/AstraLinuxSE-1.5.cmake | 8 ------ MyxCMake/lib/toolchains/Clang.cmake | 3 --- MyxCMake/lib/toolchains/ElbrusD-1.4.cmake | 9 ------- MyxCMake/lib/toolchains/GCC.cmake | 3 --- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx-unity.py | 2 ++ myx_setup.cmake | 4 +-- 13 files changed, 30 insertions(+), 39 deletions(-) delete mode 100644 MyxCMake/lib/toolchains/AstraLinuxSE-1.5.cmake delete mode 100644 MyxCMake/lib/toolchains/Clang.cmake delete mode 100644 MyxCMake/lib/toolchains/ElbrusD-1.4.cmake delete mode 100644 MyxCMake/lib/toolchains/GCC.cmake diff --git a/MyxCMake/MyxCMakeConfig.cmake b/MyxCMake/MyxCMakeConfig.cmake index f5ea8e6..13e1632 100644 --- a/MyxCMake/MyxCMakeConfig.cmake +++ b/MyxCMake/MyxCMakeConfig.cmake @@ -53,10 +53,7 @@ include(${MYX_CMAKE_LIB_DIR}/SemanticProjectVersion.cmake) include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWrapper.cmake) include(${MYX_CMAKE_LIB_DIR}/DownloadContent.cmake) -set(MYX_CMAKE_TOOLCHAINS_DIR "${MYX_CMAKE_LIB_DIR}/toolchains") include(${MYX_CMAKE_LIB_DIR}/Toolchains.cmake) -unset(MYX_CMAKE_TOOLCHAINS_DIR) - include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake) include(${MYX_CMAKE_LIB_DIR}/AddInterfaceLibrary.cmake) include(${MYX_CMAKE_LIB_DIR}/AddObjectLibrary.cmake) diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 746b7d4..82ac582 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.16") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.17") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/Toolchains.cmake b/MyxCMake/lib/Toolchains.cmake index 963098d..9a2b5b3 100644 --- a/MyxCMake/lib/Toolchains.cmake +++ b/MyxCMake/lib/Toolchains.cmake @@ -34,23 +34,38 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - include("${MYX_CMAKE_TOOLCHAINS_DIR}/GCC.cmake") + if(CMAKE_COLOR_MAKEFILE) + check_enable_cxx_compiler_flag(-fdiagnostics-color=auto) + endif() endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - include("${MYX_CMAKE_TOOLCHAINS_DIR}/Clang.cmake") + if(CMAKE_COLOR_MAKEFILE) + check_enable_cxx_compiler_flag(-fcolor-diagnostics) + endif() endif() if((MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE") AND (MYX_CMAKE_LSB_CODENAME STREQUAL "smolensk") AND (MYX_CMAKE_LSB_RELEASE_VERSION STREQUAL "1.5")) - include("${MYX_CMAKE_TOOLCHAINS_DIR}/AstraLinuxSE-1.5.cmake") - return() + find_program(CMAKE_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7") + find_program(CMAKE_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7") + find_program(CMAKE_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7") + + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_EXTENSIONS ON) + check_enable_cxx_compiler_flag(-Wno-shadow) endif() if((MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "ElbrusD") AND (MYX_CMAKE_LSB_CODENAME STREQUAL "Jessie") AND (MYX_CMAKE_LSB_RELEASE_VERSION VERSION_GREATER "1.4")) - include("${MYX_CMAKE_TOOLCHAINS_DIR}/ElbrusD-1.4.cmake") - return() + find_program(CMAKE_AR NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ar") + find_program(CMAKE_NM NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/nm") + find_program(CMAKE_RANLIB NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ranlib") + + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_EXTENSIONS ON) + check_enable_cxx_compiler_flag(-Wno-invalid-offsetof) + list(APPEND CMAKE_LIBRARY_PATH "/usr/lib/e2k-linux-gnu") endif() diff --git a/MyxCMake/lib/toolchains/AstraLinuxSE-1.5.cmake b/MyxCMake/lib/toolchains/AstraLinuxSE-1.5.cmake deleted file mode 100644 index df9db4a..0000000 --- a/MyxCMake/lib/toolchains/AstraLinuxSE-1.5.cmake +++ /dev/null @@ -1,8 +0,0 @@ -find_program(CMAKE_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7") -find_program(CMAKE_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7") -find_program(CMAKE_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7") - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_EXTENSIONS ON) -check_enable_cxx_compiler_flag(-Wno-shadow) - diff --git a/MyxCMake/lib/toolchains/Clang.cmake b/MyxCMake/lib/toolchains/Clang.cmake deleted file mode 100644 index e5f1d62..0000000 --- a/MyxCMake/lib/toolchains/Clang.cmake +++ /dev/null @@ -1,3 +0,0 @@ -if(CMAKE_COLOR_MAKEFILE) - check_enable_cxx_compiler_flag(-fcolor-diagnostics) -endif() diff --git a/MyxCMake/lib/toolchains/ElbrusD-1.4.cmake b/MyxCMake/lib/toolchains/ElbrusD-1.4.cmake deleted file mode 100644 index 29b46c6..0000000 --- a/MyxCMake/lib/toolchains/ElbrusD-1.4.cmake +++ /dev/null @@ -1,9 +0,0 @@ -find_program(CMAKE_AR NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ar") -find_program(CMAKE_NM NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/nm") -find_program(CMAKE_RANLIB NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ranlib") - -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_EXTENSIONS ON) -check_enable_cxx_compiler_flag(-Wno-invalid-offsetof) -list(APPEND CMAKE_LIBRARY_PATH "/usr/lib/e2k-linux-gnu") - diff --git a/MyxCMake/lib/toolchains/GCC.cmake b/MyxCMake/lib/toolchains/GCC.cmake deleted file mode 100644 index 3ac7ec8..0000000 --- a/MyxCMake/lib/toolchains/GCC.cmake +++ /dev/null @@ -1,3 +0,0 @@ -if(CMAKE_COLOR_MAKEFILE) - check_enable_cxx_compiler_flag(-fdiagnostics-color=auto) -endif() diff --git a/README.md b/README.md index d0844d2..0c4bf22 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.16/myx-cmake-local-2.4.16.tar.xz ). +[архив](../../../releases/download/2.4.17/myx-cmake-local-2.4.17.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 4863400..1324c03 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.16 +2.4.17 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 8901d07..da261ec 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -project(myx-cmake VERSION 2.4.16 LANGUAGES) +project(myx-cmake VERSION 2.4.17 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 9b4820b..6f7cbd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.16) unstable; urgency=medium +myx-cmake (2.4.17) unstable; urgency=medium * New version. diff --git a/myx-unity.py b/myx-unity.py index e2643d8..c9d9af4 100644 --- a/myx-unity.py +++ b/myx-unity.py @@ -36,3 +36,5 @@ with open(D2 + '/MyxCMakeConfig.cmake', encoding='utf-8') as f: os.remove(fname) else: print(line) + +os.rmdir(D2 + '/lib/macro') diff --git a/myx_setup.cmake b/myx_setup.cmake index 8fd15d3..b00b16d 100644 --- a/myx_setup.cmake +++ b/myx_setup.cmake @@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR}) set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR}) endif() if(MYX_CMAKE_DIR) - find_package(MyxCMake 2.4.16 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.17 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() if(MYX_CMAKE_USE_SYSTEM) - find_package(MyxCMake 2.4.16 REQUIRED) + find_package(MyxCMake 2.4.17 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)