cmake/myx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

1.99.94

Browse Source
This commit is contained in:
Andrei Astafev
2022-10-05 15:04:56 +03:00
parent 38b8da8bf5
commit 28b208ae6f
8 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -28,8 +28,12 @@ pack:
cp -ap $(TOP_DIR)/myx_setup.cmake $(PACK_DIR) cp -ap $(TOP_DIR)/myx_setup.cmake $(PACK_DIR)
cd $(PACK_DIR); tar acf $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz * cd $(PACK_DIR); tar acf $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz *
#cp -ap *.cmake lib backports "$D/myx-cmake-$V/MyxCMake" upload:
#pushd "$D" git tag $(V)
#tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V" tea r c --repo cmake/myx -t $(V) --tag $(V) \
#popd -a $(BUILD_DIR)/myx-cmake_$(V).dsc \
-a $(BUILD_DIR)/myx-cmake_$(V).tar.xz \
-a $(BUILD_DIR)/myx-cmake_$(V)_all.deb \
-a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz
git tag -d $(V)
git push

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "1.99.93") set(MYX_CMAKE_PACKAGE_VERSION "1.99.94")
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()

4
README.md
View File

@@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
endif() endif()
if(DEFINED ENV{MYX_CMAKE_DIR}) if(DEFINED ENV{MYX_CMAKE_DIR})
find_package(MyxCMake 1.99.93 REQUIRED) find_package(MyxCMake 1.99.94 REQUIRED)
else() else()
if(MYX_CMAKE_USE_SYSTEM) if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 1.99.93 REQUIRED) find_package(MyxCMake 1.99.94 REQUIRED)
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
endif() endif()

2
VERSION
View File

@@ -1 +1 @@
1.99.93 1.99.94

2
debian/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR) cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
project(myx-cmake VERSION 1.99.93 LANGUAGES) project(myx-cmake VERSION 1.99.94 LANGUAGES)
include(GNUInstallDirs) include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
myx-cmake (1.99.93) unstable; urgency=medium myx-cmake (1.99.94) unstable; urgency=medium
* New version. * New version.

4
myx_setup.cmake
View File

@@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR)
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR}) set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
endif() endif()
if(DEFINED ENV{MYX_CMAKE_DIR}) if(DEFINED ENV{MYX_CMAKE_DIR})
find_package(MyxCMake 1.99.93 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH) find_package(MyxCMake 1.99.94 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
if(MYX_CMAKE_USE_SYSTEM) if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 1.99.93 REQUIRED) find_package(MyxCMake 1.99.94 REQUIRED)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)

17
upload_release.sh
View File

@@ -1,17 +0,0 @@
#!/bin/bash
set -e
V=$(cat VERSION)
D="$(pwd)/build"
git commit -a
git tag $V
git push --all
tea r c --repo cmake/myx -t $V --tag $V \
-a "$D"/myx-cmake_${V}.dsc \
-a "$D"/myx-cmake_${V}.tar.xz \
-a "$D"/myx-cmake_${V}_all.deb \
-a "$D"/myx-cmake-local-${V}.tar.xz
git tag -d $V
git pushall