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

Compare commits

base: cmake:4a7351c42b4a76b3332fd345c7638b5c3d5caa44
Branches Tags
cmake:master
cmake:2.4.45
cmake:2.4.44
cmake:2.4.43
cmake:2.4.42
..
compare: cmake:a3461df5b1818f4df46b92f08333ad6d1a90e856
Branches Tags
cmake:master
cmake:2.4.45
cmake:2.4.44
cmake:2.4.43
cmake:2.4.42

No commits in common. "4a7351c42b4a76b3332fd345c7638b5c3d5caa44" and "a3461df5b1818f4df46b92f08333ad6d1a90e856" have entirely different histories.
4a7351c42b ... a3461df5b1

7 changed files with 9 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

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

9
MyxCMake/lib/TargetSetup.cmake
View File

@ -75,13 +75,8 @@ function(myx_target_setup TARGET_NAME)
install(TARGETS ${TARGET_NAME} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(${CMAKE_VERSION} VERSION_LESS "3.11.99")
target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_PUBLIC_HEADERS}>)
target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}>)
else()
target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_HEADERS})
target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
endif()
target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_PUBLIC_HEADERS}>)
target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}>)
target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES})

2
README.md
View File

@ -3,7 +3,7 @@
## Установка
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
[архив](../../../releases/download/2.4.37/myx-cmake-local-2.4.37.tar.xz ).
[архив](../../../releases/download/2.4.35/myx-cmake-local-2.4.35.tar.xz ).
## Использование

2
VERSION
View File

@ -1 +1 @@
2.4.37
2.4.35

2
debian/CMakeLists.txt vendored
View File

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

2
debian/changelog vendored
View File

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

4
myx_setup.cmake
View File

@ -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.37 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.37 REQUIRED)
find_package(MyxCMake 2.4.35 REQUIRED)
myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)