Обновление

This commit is contained in:
Andrei Astafev 2021-07-02 10:57:21 +03:00
parent b61c84082d
commit c8acc9c415
2 changed files with 3 additions and 7 deletions

View File

@ -11,7 +11,7 @@ project(cmlib-example-app-qt5-con VERSION 0.2.0 LANGUAGES C CXX)
set(CMLIB_ORGANIZATION_NAME "ECS5" CACHE STRING "") set(CMLIB_ORGANIZATION_NAME "ECS5" CACHE STRING "")
set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "") set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "")
set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "") set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
set(CMLIB_DESCRIPTION "Пример проекта: приложение Qt5" CACHE STRING "") set(CMLIB_DESCRIPTION "Пример проекта: консольное приложение Qt5" CACHE STRING "")
# В каталоге cmake/cmlib находятся файлы с библиотечными функциями # В каталоге cmake/cmlib находятся файлы с библиотечными функциями
if(NOT DEFINED CMLIB_MAIN_DIR) if(NOT DEFINED CMLIB_MAIN_DIR)
@ -45,11 +45,7 @@ ExternalProject_Add(
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND CONFIGURE_COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>
${CMAKE_COMMAND} -"G${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} <SOURCE_DIR>
BUILD_COMMAND true) BUILD_COMMAND true)
# Приложение # Приложение

View File

@ -43,4 +43,4 @@ target_link_libraries(${TRGT} myx-qt myx-filesystem)
set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT}) set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT})
# Правила для установки # Правила для установки
install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS ${TRGT} COMPONENT main RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})