f1x1t/myx-cmake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: f1x1t:e81a491606c21e996c2521d8d3147d61f9610b9e
Branches Tags
f1x1t:master
f1x1t:0.6.0
..
compare: f1x1t:20d372a25c1045218d7992cd7758db43e064b9b0
Branches Tags
f1x1t:master
f1x1t:0.6.0

No commits in common. "e81a491606c21e996c2521d8d3147d61f9610b9e" and "20d372a25c1045218d7992cd7758db43e064b9b0" have entirely different histories.
e81a491606 ... 20d372a25c

18 changed files with 54 additions and 41 deletions
Show Stats Expand all files Collapse all files

2
MyxCMake/find/FindCgalWidgetThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
cgal-widget cgal-widget
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/cgal-widget
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers") if(CgalWidgetThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindFcProtocolThirdparty.cmake
View File

@ -16,7 +16,7 @@ list(APPEND _ext_project_args
fc-protocol fc-protocol
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/fc-protocol
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(FcProtocolThirdparty_FIND_COMPONENTS STREQUAL "headers") if(FcProtocolThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindFspThirdparty.cmake
View File

@ -23,7 +23,7 @@ list(APPEND _ext_project_args
DEPENDS libpreprocmath libionobase myxlib DEPENDS libpreprocmath libionobase myxlib
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libfsp SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libfsp
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-DIONOBASE_PREFIX=${CMAKE_BINARY_DIR} -DIONOBASE_PREFIX=${CMAKE_BINARY_DIR}
-DMYXLIB_PREFIX=${CMAKE_BINARY_DIR} -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR}

2
MyxCMake/find/FindImitatorThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
libimitator libimitator
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libimitator SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libimitator
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
-DMYXLIB_PREFIX=${CMAKE_BINARY_DIR} -DMYXLIB_PREFIX=${CMAKE_BINARY_DIR}
<SOURCE_DIR>) <SOURCE_DIR>)

2
MyxCMake/find/FindIonobaseThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
libionobase libionobase
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libionobase SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libionobase
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers") if(IonobaseThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindMyxNotificationsThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
myx-notifications myx-notifications
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-notifications
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers") if(MyxNotificationsThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindMyxQPingThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
myx-qping myx-qping
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-qping
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers") if(MyxQPingThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindMyxRedisThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
myx-redis myx-redis
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myx-redis
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers") if(MyxRedisThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindMyxlibThirdparty.cmake
View File

@ -29,7 +29,7 @@ list(APPEND _ext_project_args
myxlib myxlib
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers") if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindPreprocThirdparty.cmake
View File

@ -23,7 +23,7 @@ list(APPEND _ext_project_args
DEPENDS libpreprocmath DEPENDS libpreprocmath
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
<SOURCE_DIR>) <SOURCE_DIR>)
if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers") if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")

2
MyxCMake/find/FindPreprocmathThirdparty.cmake
View File

@ -22,7 +22,7 @@ list(APPEND _ext_project_args
libpreprocmath libpreprocmath
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers") if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/find/FindSignalViewThirdparty.cmake
View File

@ -23,7 +23,7 @@ list(APPEND _ext_project_args
DEPENDS libpreprocmath DEPENDS libpreprocmath
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libsignalview
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
-DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR} -DPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
<SOURCE_DIR>) <SOURCE_DIR>)
if(SignalViewThirdparty_FIND_COMPONENTS STREQUAL "headers") if(SignalViewThirdparty_FIND_COMPONENTS STREQUAL "headers")

2
MyxCMake/find/FindVeerProtocolsThirdparty.cmake
View File

@ -6,7 +6,7 @@ list(APPEND _ext_project_args
veer-protocols veer-protocols
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/veer-protocols
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS ${MYX_CMAKE_EXTERNAL_PROJECT_ARGS} CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
<SOURCE_DIR>) <SOURCE_DIR>)
if(VeerProtocolsThirdparty_FIND_COMPONENTS STREQUAL "headers") if(VeerProtocolsThirdparty_FIND_COMPONENTS STREQUAL "headers")
list(APPEND _ext_project_args list(APPEND _ext_project_args

2
MyxCMake/functions/MyxCMakeDocBreathe.cmake
View File

@ -83,7 +83,7 @@ function(myx_cmake_doc_breathe)
COMPONENT doc OPTIONAL COMPONENT doc OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe) DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe)
else() else()
message(STATUS "MyxCMake:") message(STATUS "CMLIB warning:")
add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build") add_custom_target(${target} VERBATIM COMMENT " Breathe is not found. Skipping target ${target} build")
endif() endif()
endfunction() endfunction()

5
MyxCMake/modules/MyxCMakeAddSharedLibrary.cmake
View File

@ -7,8 +7,9 @@ function(myx_cmake_add_shared_library target)
endif() endif()
get_target_property(__target_type ${target} TYPE) get_target_property(__target_type ${target} TYPE)
if(NOT __target_type STREQUAL OBJECT_LIBRARY) if(NOT __target_type STREQUAL OBJECT_LIBRARY)
message(FATAL_ERROR message(
"MyxCMake: myx_cmake_add_shared_library needs target of type OBJECT_LIBRARY") FATAL_ERROR
"MyxCMake: myx_cmake_add_shared_library needs target of type OBJECT_LIBRARY")
return() return()
endif() endif()

5
MyxCMake/modules/MyxCMakeAddStaticLibrary.cmake
View File

@ -7,8 +7,9 @@ function(myx_cmake_add_static_library target)
endif() endif()
get_target_property(__target_type ${target} TYPE) get_target_property(__target_type ${target} TYPE)
if(NOT __target_type STREQUAL OBJECT_LIBRARY) if(NOT __target_type STREQUAL OBJECT_LIBRARY)
message(FATAL_ERROR message(
"MyxCMake: myx_cmake_add_static_library needs target of type OBJECT_LIBRARY") FATAL_ERROR
"MyxCMake: myx_cmake_add_static_library needs target of type OBJECT_LIBRARY")
return() return()
endif() endif()

37
MyxCMake/modules/MyxCMakeBuildTypes.cmake
View File

@ -2,8 +2,9 @@ cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW) # IN_LIST operator cmake_policy(SET CMP0057 NEW) # IN_LIST operator
option(MYX_CMAKE_ENABLE_WARNING_FLAGS "Enable autodetected warning flags" ON) option(MYX_CMAKE_ENABLE_WARNING_FLAGS "Enable autodetected warning flags" ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL set(CMAKE_EXPORT_COMPILE_COMMANDS
"Enable generation of compile_commands.json." FORCE) ON
CACHE BOOL "Enable generation of compile_commands.json." FORCE)
# Добавление конфигурации для профилирования # Добавление конфигурации для профилирования
if(CMAKE_CONFIGURATION_TYPES) if(CMAKE_CONFIGURATION_TYPES)
@ -14,7 +15,9 @@ else()
set(_allowed_build_types None Debug Release Profile RelWithDebInfo MinSizeRel) set(_allowed_build_types None Debug Release Profile RelWithDebInfo MinSizeRel)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${_allowed_build_types}) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${_allowed_build_types})
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug CACHE STRING "" FORCE) set(CMAKE_BUILD_TYPE
Debug
CACHE STRING "" FORCE)
elseif(NOT "${CMAKE_BUILD_TYPE}" IN_LIST _allowed_build_types) elseif(NOT "${CMAKE_BUILD_TYPE}" IN_LIST _allowed_build_types)
message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}") message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
endif() endif()
@ -49,15 +52,20 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
elseif(CMAKE_CXX_COMPILER_IS_MSVC) elseif(CMAKE_CXX_COMPILER_IS_MSVC)
message("Set options for profiling with Visual Studio C++") message("Set options for profiling with Visual Studio C++")
endif() endif()
set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL set(CMAKE_VERBOSE_MAKEFILE
"Enable generation of verbose build scripts." FORCE) ON
CACHE BOOL "Enable generation of verbose build scripts." FORCE)
elseif(CMAKE_BUILD_TYPE STREQUAL Debug) elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
# В режиме отладки подробный вывод сообщений компилятора # В режиме отладки подробный вывод сообщений компилятора
if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_GCC) if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_GCC)
string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_C_FLAGS_DEBUG
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${_gcc_debug_flags}" CACHE STRING "" FORCE) "${CMAKE_C_FLAGS_DEBUG}")
set(CMAKE_C_FLAGS_DEBUG
"${CMAKE_C_FLAGS_DEBUG} ${_gcc_debug_flags}"
CACHE STRING "" FORCE)
string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") string(REPLACE " ${_gcc_debug_flags}" "" CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG}")
if(MYX_CMAKE_ENABLE_WARNING_FLAGS) if(MYX_CMAKE_ENABLE_WARNING_FLAGS)
set(CMAKE_CXX_FLAGS_DEBUG set(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} ${MYX_CMAKE_DETECTED_CXX_FLAGS_DEBUG} ${_gcc_debug_flags}" "${CMAKE_CXX_FLAGS_DEBUG} ${MYX_CMAKE_DETECTED_CXX_FLAGS_DEBUG} ${_gcc_debug_flags}"
@ -68,15 +76,18 @@ elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
CACHE STRING "" FORCE) CACHE STRING "" FORCE)
endif() endif()
endif() endif()
set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL set(CMAKE_VERBOSE_MAKEFILE
"Enable generation of verbose build scripts." FORCE) ON
CACHE BOOL "Enable generation of verbose build scripts." FORCE)
elseif(CMAKE_BUILD_TYPE STREQUAL Release) elseif(CMAKE_BUILD_TYPE STREQUAL Release)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MYX_CMAKE_DETECTED_CXX_FLAGS}" set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${MYX_CMAKE_DETECTED_CXX_FLAGS}"
CACHE STRING "" FORCE) CACHE STRING "" FORCE)
elseif(CMAKE_BUILD_TYPE STREQUAL None) elseif(CMAKE_BUILD_TYPE STREQUAL None)
# Режим None используется для статического анализа кода # Режим None используется для статического анализа кода
set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL set(CMAKE_VERBOSE_MAKEFILE
"Enable generation of verbose build scripts." FORCE) ON
CACHE BOOL "Enable generation of verbose build scripts." FORCE)
endif() endif()
unset(_gcc_debug_flags) unset(_gcc_debug_flags)

20
MyxCMake/modules/MyxCMakeCPack.cmake
View File

@ -40,16 +40,16 @@ option(MYX_CMAKE_COMPACT_SOURCE_PACKAGE "Make compact source package" ON)
if(MYX_CMAKE_COMPACT_SOURCE_PACKAGE) if(MYX_CMAKE_COMPACT_SOURCE_PACKAGE)
# Список масок для исключения из архива исходных текстов для более компактного архива # Список масок для исключения из архива исходных текстов для более компактного архива
set(CPACK_SOURCE_IGNORE_FILES set(CPACK_SOURCE_IGNORE_FILES
"${CPACK_SOURCE_IGNORE_FILES}" "${CPACK_SOURCE_IGNORE_FILES}"
"\\\\.git" "\\\\.git"
"/\\\\.git/" "/\\\\.git/"
"/\\\\.gitlab-ci/" "/\\\\.gitlab-ci/"
"\\\\.clang-tidy$" "\\\\.clang-tidy$"
"\\\\.cmake-format$" "\\\\.cmake-format$"
"\\\\.gitignore$" "\\\\.gitignore$"
"\\\\.gitattributes$" "\\\\.gitattributes$"
"\\\\.gitmodules$" "\\\\.gitmodules$"
"\\\\.gitlab-ci.yml$") "\\\\.gitlab-ci.yml$")
endif() endif()
set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/MyxCMakeCPackProject.cmake) set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/MyxCMakeCPackProject.cmake)