1.99.93
This commit is contained in:
		@@ -33,6 +33,7 @@ include(${MYX_CMAKE_LIB_DIR}/SemanticProjectVersion.cmake)
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWrapper.cmake)
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/FetchContentAdd.cmake)
 | 
			
		||||
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake)
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/AddLibrary.cmake)
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/TargetSetup.cmake)
 | 
			
		||||
include(${MYX_CMAKE_LIB_DIR}/Qt5TargetSetup.cmake)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.92")
 | 
			
		||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.93")
 | 
			
		||||
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
 | 
			
		||||
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
 | 
			
		||||
else()
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										22
									
								
								MyxCMake/lib/AddExecutable.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								MyxCMake/lib/AddExecutable.cmake
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
#[=======================================================================[.rst:
 | 
			
		||||
myx_add_executable
 | 
			
		||||
------------------
 | 
			
		||||
 | 
			
		||||
Вспомогательная функция для создания исполняемого файла::
 | 
			
		||||
 | 
			
		||||
    myx_add_executable(NAME)
 | 
			
		||||
 | 
			
		||||
Используется для совместимости с версиями CMake раньше 3.11,
 | 
			
		||||
в которых было необходимо указать хотя бы один файл с исходными текстами.
 | 
			
		||||
 | 
			
		||||
#]=======================================================================]
 | 
			
		||||
 | 
			
		||||
include_guard(GLOBAL)
 | 
			
		||||
 | 
			
		||||
function(myx_add_executable NAME)
 | 
			
		||||
  if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
 | 
			
		||||
    add_executable(${NAME} ${ARGN} "")
 | 
			
		||||
  else()
 | 
			
		||||
    add_executable(${NAME} ${ARGN})
 | 
			
		||||
  endif()
 | 
			
		||||
endfunction()
 | 
			
		||||
@@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
 | 
			
		||||
  set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
 | 
			
		||||
endif()
 | 
			
		||||
if(DEFINED ENV{MYX_CMAKE_DIR})
 | 
			
		||||
  find_package(MyxCMake 1.99.92 REQUIRED)
 | 
			
		||||
  find_package(MyxCMake 1.99.93 REQUIRED)
 | 
			
		||||
else()
 | 
			
		||||
  if(MYX_CMAKE_USE_SYSTEM)
 | 
			
		||||
    find_package(MyxCMake 1.99.92 REQUIRED)
 | 
			
		||||
    find_package(MyxCMake 1.99.93 REQUIRED)
 | 
			
		||||
  else()
 | 
			
		||||
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
 | 
			
		||||
  endif()
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								debian/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
			
		||||
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
 | 
			
		||||
project(myx-cmake VERSION 1.99.92 LANGUAGES)
 | 
			
		||||
project(myx-cmake VERSION 1.99.93 LANGUAGES)
 | 
			
		||||
 | 
			
		||||
include(GNUInstallDirs)
 | 
			
		||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
myx-cmake (1.99.92) unstable; urgency=medium
 | 
			
		||||
myx-cmake (1.99.93) unstable; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * New version.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,11 +16,11 @@ if(MYX_CMAKE_DIR)
 | 
			
		||||
  set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
 | 
			
		||||
endif()
 | 
			
		||||
if(DEFINED ENV{MYX_CMAKE_DIR})
 | 
			
		||||
  find_package(MyxCMake 1.99.92 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH)
 | 
			
		||||
  find_package(MyxCMake 1.99.93 REQUIRED CONFIG PATHS $ENV{MYX_CMAKE_DIR} NO_DEFAULT_PATH)
 | 
			
		||||
  myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 | 
			
		||||
else()
 | 
			
		||||
  if(MYX_CMAKE_USE_SYSTEM)
 | 
			
		||||
    find_package(MyxCMake 1.99.92 REQUIRED)
 | 
			
		||||
    find_package(MyxCMake 1.99.93 REQUIRED)
 | 
			
		||||
    myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 | 
			
		||||
  else()
 | 
			
		||||
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
 | 
			
		||||
 
 | 
			
		||||
@@ -7,12 +7,11 @@ D="$(pwd)/build"
 | 
			
		||||
 | 
			
		||||
git commit -a
 | 
			
		||||
git tag $V
 | 
			
		||||
git push --tags
 | 
			
		||||
git tag -d $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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user