From a8fa7bd1c353082bb29a3d1141225870a950553f Mon Sep 17 00:00:00 2001 From: MF Date: Sat, 18 Jan 2020 20:08:41 +0000 Subject: [PATCH] Moved qt5 linguist tool find package into the other qt find package statement --- CMakeLists.txt | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9edccf..c4dcccf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,15 +13,10 @@ list(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake) - -# pasted - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt5 COMPONENTS Core Concurrent Widgets REQUIRED) - -find_package(Qt5LinguistTools) +find_package(Qt5 COMPONENTS Core Concurrent LinguistTools Widgets REQUIRED) qt5_create_translation(${PROJ_NAME}_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/${PROJ_NAME}_en.ts) set(Boost_USE_STATIC_LIBS ON) @@ -106,24 +101,24 @@ target_compile_options(${PROJ_NAME} PRIVATE $<$:-Wall>) target_include_directories(${PROJ_NAME} PUBLIC - $ + $ $ PRIVATE - ${BOOST_DI_ROOT}/include - ${BOOST_DI_ROOT}/extension/include - ${LIBBSARCH_ROOT} - ${Boost_INCLUDE_DIRS} + ${BOOST_DI_ROOT}/include + ${BOOST_DI_ROOT}/extension/include + ${LIBBSARCH_ROOT} + ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src ${default_project_path}/uibase/src ) target_link_directories(${PROJ_NAME} PUBLIC - ${lib_path} + ${lib_path} $ ${Boost_LIBRARY_DIRS} - PRIVATE - ${LIBBSARCH_ROOT}) + PRIVATE + ${LIBBSARCH_ROOT}) message("Default path is: ${default_project_path}") message("Project path is: ${project_path}") @@ -132,7 +127,7 @@ message("packer path is ${CMAKE_SOURCE_DIR}/include/bsapacker") target_link_libraries(${PROJ_NAME} PUBLIC - Qt5::Widgets + Qt5::Widgets Qt5::Concurrent Qt5::Gui ${Boost_LIBRARIES}