2.2.4

2022-11-28 07:13:09 +03:00 · 2022-11-28 07:13:09 +03:00 · 785c69f707
commit 785c69f707
parent 2a03264b98
10 changed files with 38 additions and 141 deletions
--- a/MyxCMake/MyxCMakeConfig.cmake
+++ b/MyxCMake/MyxCMakeConfig.cmake
@ -40,6 +40,7 @@ include(${MYX_CMAKE_LIB_DIR}/macro/CreateSymlink.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/CheckEnableCxxCompilerFlag.cmake)
+include(${MYX_CMAKE_LIB_DIR}/macro/GTest.cmake)

 include(${MYX_CMAKE_LIB_DIR}/ColoredMessages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/PopulateCMakeBinaryDir.cmake)
@ -55,8 +56,6 @@ include(${MYX_CMAKE_LIB_DIR}/Toolchains.cmake)
 unset(MYX_CMAKE_TOOLCHAINS_DIR)

 include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake)
-include(${MYX_CMAKE_LIB_DIR}/AddSaprBlock.cmake)
-include(${MYX_CMAKE_LIB_DIR}/AddSaprTest.cmake)
 include(${MYX_CMAKE_LIB_DIR}/AddInterfaceLibrary.cmake)
 include(${MYX_CMAKE_LIB_DIR}/AddObjectLibrary.cmake)
 include(${MYX_CMAKE_LIB_DIR}/TargetSetup.cmake)
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.2.2")
+set(MYX_CMAKE_PACKAGE_VERSION "2.2.4")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
--- a/MyxCMake/lib/AddSaprBlock.cmake
+++ b/MyxCMake/lib/AddSaprBlock.cmake
@ -1,75 +0,0 @@
-#[=======================================================================[.rst:
-myx_add_sapr_block
------------------
-
-Вспомогательная функция для создания блока САПР::
-
-    myx_add_sapr_block(TARGET_NAME)
-
-Обязательные параметры: `TARGET_NAME` - имя библиотеки.
-Все остальные параметры передаются в стандартную функцию `add_library()`
-
-#]=======================================================================]
-
-include_guard(GLOBAL)
-
-include(CMakePackageConfigHelpers)
-include(GenerateExportHeader)
-
-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-  set(MYX_CMAKE_LIB_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
-endif()
-
-function(myx_add_sapr_block TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
-  endif()
-
-  # Вызов стандартной функции `add_library()`
-  if(DEFINED ENV{SAPR_PREFIX})
-    add_library(${TARGET_NAME} SHARED ${ARG_UNPARSED_ARGUMENTS})
-  else()
-    add_library(${TARGET_NAME} STATIC ${ARG_UNPARSED_ARGUMENTS})
-    set_target_properties(${TARGET_NAME} PROPERTIES
-      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-  endif()
-
-  # Стандартные пути к заголовочным файлам
-  target_include_directories(${TARGET_NAME}
-    PUBLIC
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-    PRIVATE
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
-      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  )
-
-  # Сборка позиционно-независимых объектных файлов нужна
-  # для создания динамической библиотеки
-  set_target_properties(${TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-  target_compile_definitions(${TARGET_NAME} PUBLIC BLOCK_TARGET_MARK)
-  if(DEFINED ENV{SAPR_PREFIX})
-    if(NOT WIN32)
-      set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN")
-    endif()
-  else()
-    if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
-      find_package(PythonLibs REQUIRED)
-      find_package(PythonInterp REQUIRED)
-      target_include_directories(${TARGET_NAME} PRIVATE ${PYTHON_INCLUDE_DIRS})
-      target_link_libraries(${TARGET_NAME} PRIVATE ${PYTHON_LIBRARIES})
-    else()
-      find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
-      target_include_directories(${TARGET_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
-    endif()
-    find_package(pybind11 REQUIRED)
-    target_include_directories(${TARGET_NAME} PRIVATE ${pybind11_INCLUDE_DIR})
-    target_include_directories(${TARGET_NAME}
-      PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
-    if(pybind11_VERSION VERSION_LESS "2.5.0")
-      target_link_libraries(${TARGET_NAME} PRIVATE pybind11::module)
-    else()
-      target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
-    endif()
-  endif()
-endfunction()
--- a/MyxCMake/lib/AddSaprTest.cmake
+++ b/MyxCMake/lib/AddSaprTest.cmake
@ -1,57 +0,0 @@
-#[=======================================================================[.rst:
-myx_add_sapr_test
-----------------
-
-Вспомогательная функция для создания теста САПР::
-
-    myx_add_sapr_block(TARGET_NAME FILE_NAME)
-
-Обязательные параметры: `TARGET_NAME` - имя теста, `FILE_NAME` - имя файла.
-
-#]=======================================================================]
-
-include_guard(GLOBAL)
-
-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-  set(MYX_CMAKE_LIB_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
-endif()
-
-function(myx_add_sapr_test TARGET_NAME FILE_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
-  endif()
-
-  add_executable(${TARGET_NAME} ${FILE_NAME})
-
-  target_include_directories(${TARGET_NAME}
-    PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
-
-  find_package(GTest)
-  if(GTest_FOUND)
-    target_link_libraries(${TARGET_NAME} PRIVATE GTest::GTest GTest::Main)
-  else()
-    add_subdirectory(/usr/src/googletest/googletest ${CMAKE_BINARY_DIR}/gtest)
-    target_link_libraries(${TARGET_NAME} PRIVATE gtest gtest_main)
-  endif()
-
-  if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
-    find_package(PythonLibs REQUIRED)
-    find_package(PythonInterp REQUIRED)
-    target_include_directories(${TARGET_NAME} PRIVATE ${PYTHON_INCLUDE_DIRS})
-    target_link_libraries(${TARGET_NAME} PRIVATE ${PYTHON_LIBRARIES})
-  else()
-    find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
-    target_include_directories(${TARGET_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
-  endif()
-
-  find_package(pybind11 REQUIRED)
-  target_include_directories(${TARGET_NAME} PRIVATE ${pybind11_INCLUDE_DIR})
-  if(pybind11_VERSION VERSION_LESS "2.5.0")
-    target_link_libraries(${TARGET_NAME} PRIVATE pybind11::module)
-  else()
-    target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
-  endif()
-
-  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
-endfunction()
-
--- a/MyxCMake/lib/macro/GTest.cmake
+++ b/MyxCMake/lib/macro/GTest.cmake
@ -0,0 +1,30 @@
+include_guard(GLOBAL)
+
+macro(myx_add_gtest TARGET_NAME)
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  add_executable(${TARGET_NAME} ${ARG_UNPARSED_ARGUMENTS})
+
+  find_package(GTest)
+  if(GTest_FOUND)
+    target_link_libraries(${TARGET_NAME} PRIVATE GTest::GTest GTest::Main)
+  else()
+    if((NOT TARGET gtest) AND (NOT TARGET gtest_main))
+      add_subdirectory(/usr/src/googletest/googletest ${CMAKE_BINARY_DIR}/gtest)
+    endif()
+    target_link_libraries(${TARGET_NAME} PRIVATE gtest gtest_main)
+  endif()
+
+  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
+  foreach(__iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${__iter})
+  endforeach()
+  unset(ARG_UNPARSED_ARGUMENTS)
+  unset(multiValueArgs)
+  unset(oneValueArgs)
+  unset(options)
+endmacro()
+
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 ## Установка

 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.2.2/myx-cmake-local-2.2.2.tar.xz ).
+[архив](../../../releases/download/2.2.4/myx-cmake-local-2.2.4.tar.xz ).

 ## Использование

--- a/2
+++ b/2
@ -1 +1 @@
-2.2.2
+2.2.4
--- 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.2.2 LANGUAGES)
+project(myx-cmake VERSION 2.2.4 LANGUAGES)

 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-myx-cmake (2.2.2) unstable; urgency=medium
+myx-cmake (2.2.4) unstable; urgency=medium

  * New version.

--- 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.2.2 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} ===")
 else()
  if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.2.2 REQUIRED)
+    find_package(MyxCMake 2.2.4 REQUIRED)
    myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
  else()
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
 @ -1 +1 @@
 .2.2
 .2.4