From a3461df5b1818f4df46b92f08333ad6d1a90e856 Mon Sep 17 00:00:00 2001 From: Andrei Astafev Date: Fri, 29 Mar 2024 12:33:45 +0300 Subject: [PATCH] 2.4.35 --- Makefile | 2 +- MyxCMake/MyxCMakeConfigVersion.cmake | 2 +- MyxCMake/lib/TargetSetup.cmake | 4 ++-- README.md | 2 +- VERSION | 2 +- debian/CMakeLists.txt | 2 +- debian/changelog | 2 +- myx_setup.cmake | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 13a34b4..ff49406 100644 --- a/Makefile +++ b/Makefile @@ -51,4 +51,4 @@ upload: -a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz \ -a $(BUILD_DIR)/myx-cmake-unity-$(V).tar.xz git tag -d $(V) - git push + git push --all diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index afd8a89..853ff4a 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.4.34") +set(MYX_CMAKE_PACKAGE_VERSION "2.4.35") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/TargetSetup.cmake b/MyxCMake/lib/TargetSetup.cmake index d61cb9d..4c15227 100644 --- a/MyxCMake/lib/TargetSetup.cmake +++ b/MyxCMake/lib/TargetSetup.cmake @@ -75,8 +75,8 @@ function(myx_target_setup TARGET_NAME) install(TARGETS ${TARGET_NAME} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() - target_sources(${TARGET_NAME} PUBLIC $) - target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}) + target_sources(${TARGET_NAME} PRIVATE $) + target_sources(${TARGET_NAME} PRIVATE $) target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS}) target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES}) diff --git a/README.md b/README.md index 7ff1fd9..fa31dd9 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.4.34/myx-cmake-local-2.4.34.tar.xz ). +[архив](../../../releases/download/2.4.35/myx-cmake-local-2.4.35.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 1422f25..01445f6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.34 +2.4.35 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index f14243e..5e2bc00 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.34 LANGUAGES) +project(myx-cmake VERSION 2.4.35 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index 6caace2..d811bd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.4.34) unstable; urgency=medium +myx-cmake (2.4.35) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 1e97b22..22d427d 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.34 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.4.35 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.34 REQUIRED) + find_package(MyxCMake 2.4.35 REQUIRED) myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)