Compare commits
No commits in common. "57429ab3bb1d57c2455c4da586aaf8178135842d" and "785c69f707119f3787f46d44cd3744d9207ad546" have entirely different histories.
57429ab3bb
...
785c69f707
@ -41,7 +41,6 @@ include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
|
|||||||
include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
|
include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
|
||||||
include(${MYX_CMAKE_LIB_DIR}/macro/CheckEnableCxxCompilerFlag.cmake)
|
include(${MYX_CMAKE_LIB_DIR}/macro/CheckEnableCxxCompilerFlag.cmake)
|
||||||
include(${MYX_CMAKE_LIB_DIR}/macro/GTest.cmake)
|
include(${MYX_CMAKE_LIB_DIR}/macro/GTest.cmake)
|
||||||
include(${MYX_CMAKE_LIB_DIR}/macro/QTest.cmake)
|
|
||||||
|
|
||||||
include(${MYX_CMAKE_LIB_DIR}/ColoredMessages.cmake)
|
include(${MYX_CMAKE_LIB_DIR}/ColoredMessages.cmake)
|
||||||
include(${MYX_CMAKE_LIB_DIR}/PopulateCMakeBinaryDir.cmake)
|
include(${MYX_CMAKE_LIB_DIR}/PopulateCMakeBinaryDir.cmake)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
set(MYX_CMAKE_PACKAGE_VERSION "2.2.6")
|
set(MYX_CMAKE_PACKAGE_VERSION "2.2.4")
|
||||||
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()
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
macro(myx_add_qtest TARGET_NAME)
|
|
||||||
set(options)
|
|
||||||
set(oneValueArgs)
|
|
||||||
set(multiValueArgs)
|
|
||||||
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
|
||||||
|
|
||||||
find_package(Qt5 COMPONENTS Core Test REQUIRED)
|
|
||||||
if(NOT Qt5Test_FOUND)
|
|
||||||
myx_message_fatal_error("Qt testing framework is not found")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
foreach(filename ${ARG_UNPARSED_ARGUMENTS})
|
|
||||||
get_filename_component(basename ${filename} NAME_WE)
|
|
||||||
list(APPEND cpps "${basename}.cpp")
|
|
||||||
list(APPEND hpps "${basename}.hpp")
|
|
||||||
qt5_wrap_cpp(moc "${basename}.hpp")
|
|
||||||
list(APPEND mocs "${moc}")
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
add_executable(${TARGET_NAME} ${mocs} ${cpps} ${hpps})
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Core Qt5::Test)
|
|
||||||
|
|
||||||
add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
|
|
||||||
|
|
||||||
unset(cpps)
|
|
||||||
unset(hpps)
|
|
||||||
unset(moc)
|
|
||||||
unset(mocs)
|
|
||||||
foreach(__iter IN LISTS oneValueArgs multiValueArgs)
|
|
||||||
unset(ARG_${__iter})
|
|
||||||
endforeach()
|
|
||||||
unset(ARG_UNPARSED_ARGUMENTS)
|
|
||||||
unset(multiValueArgs)
|
|
||||||
unset(oneValueArgs)
|
|
||||||
unset(options)
|
|
||||||
endmacro()
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
## Установка
|
## Установка
|
||||||
|
|
||||||
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
|
В корневом каталоге проекта создать каталог `cmake` и распаковать в него
|
||||||
[архив](../../../releases/download/2.2.6/myx-cmake-local-2.2.6.tar.xz ).
|
[архив](../../../releases/download/2.2.4/myx-cmake-local-2.2.4.tar.xz ).
|
||||||
|
|
||||||
## Использование
|
## Использование
|
||||||
|
|
||||||
|
2
debian/CMakeLists.txt
vendored
2
debian/CMakeLists.txt
vendored
@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
|
||||||
project(myx-cmake VERSION 2.2.6 LANGUAGES)
|
project(myx-cmake VERSION 2.2.4 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
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
myx-cmake (2.2.6) unstable; urgency=medium
|
myx-cmake (2.2.4) unstable; urgency=medium
|
||||||
|
|
||||||
* New version.
|
* New version.
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
|
|||||||
set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
|
set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(MYX_CMAKE_DIR)
|
if(MYX_CMAKE_DIR)
|
||||||
find_package(MyxCMake 2.2.6 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
|
find_package(MyxCMake 2.2.4 REQUIRED CONFIG PATHS ${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 2.2.6 REQUIRED)
|
find_package(MyxCMake 2.2.4 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)
|
||||||
|
Loading…
Reference in New Issue
Block a user