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

1.99.44

Browse Source
This commit is contained in:
Andrei Astafev 2022-10-02 16:33:14 +03:00
parent c03e7dbd2b
commit 60a910332d
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMakeConfigVersion.cmake
View File

@ -1,4 +1,4 @@
set(MYX_CMAKE_PACKAGE_VERSION "1.99.43") set(MYX_CMAKE_PACKAGE_VERSION "1.99.44")
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()

2
README.md
View File

@ -12,7 +12,7 @@
```cmake ```cmake
if(MYX_CMAKE_USE_SYSTEM) if(MYX_CMAKE_USE_SYSTEM)
find_package(MyxCMake 1.99.43 REQUIRED) find_package(MyxCMake 1.99.44 REQUIRED)
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
endif() endif()

2
VERSION.txt
View File

@ -1 +1 @@
1.99.43 1.99.44

18
lib/Qt5TargetSetup.cmake
View File

@ -56,9 +56,9 @@ function(myx_qt5_target_setup NAME)
if("LinguistTools" IN_LIST ARG_COMPONENTS) if("LinguistTools" IN_LIST ARG_COMPONENTS)
foreach(iter ${ARG_LANGS}) foreach(iter ${ARG_LANGS})
qt5_create_translation(qm qt5_create_translation(qm
"${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/include"
"${PROJECT_SOURCE_DIR}/src" "${PROJECT_SOURCE_DIR}/src"
"${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts") "${PROJECT_SOURCE_DIR}/l10n/${NAME}_${iter}.ts")
target_sources(${NAME} PRIVATE ${qm}) target_sources(${NAME} PRIVATE ${qm})
endforeach() endforeach()
unset(qm) unset(qm)
@ -67,9 +67,11 @@ function(myx_qt5_target_setup NAME)
target_sources(${NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp}) target_sources(${NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
# Установка публичных заголовочных файлов # Установка публичных заголовочных файлов
install_relative(${PROJECT_SOURCE_DIR} if(PROJECT_IS_TOP_LEVEL)
FILES ${ARG_PUBLIC_MOC} install_relative(${PROJECT_SOURCE_DIR}
DESTINATION ${CMAKE_INSTALL_PREFIX} FILES ${ARG_PUBLIC_MOC}
COMPONENT dev DESTINATION ${CMAKE_INSTALL_PREFIX}
) COMPONENT dev
)
endif()
endfunction() endfunction()

12
lib/TargetSetup.cmake
View File

@ -76,9 +76,11 @@ function(myx_target_setup NAME)
target_compile_definitions(${NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS}) target_compile_definitions(${NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
# Установка публичных заголовочных файлов # Установка публичных заголовочных файлов
install_relative(${PROJECT_SOURCE_DIR} if(PROJECT_IS_TOP_LEVEL)
FILES ${ARG_PUBLIC_HEADERS} install_relative(${PROJECT_SOURCE_DIR}
DESTINATION ${CMAKE_INSTALL_PREFIX} FILES ${ARG_PUBLIC_HEADERS}
COMPONENT dev DESTINATION ${CMAKE_INSTALL_PREFIX}
) COMPONENT dev
)
endif()
endfunction() endfunction()