Renamed core subproject into BeetRoundCore.
This commit is contained in:
@ -8,8 +8,8 @@ enable_testing()
|
|||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
add_subdirectory(libs/GenericCore)
|
add_subdirectory(libs/BeetRoundCore)
|
||||||
set (CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/GenericCore)
|
set (CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/BeetRoundCore)
|
||||||
|
|
||||||
### 3rd party libraries
|
### 3rd party libraries
|
||||||
add_subdirectory(libs/3rdParty/Qt-QrCodeGenerator)
|
add_subdirectory(libs/3rdParty/Qt-QrCodeGenerator)
|
||||||
|
|||||||
@ -63,7 +63,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
|||||||
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
|
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
|
||||||
|
|
||||||
target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/)
|
target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/)
|
||||||
target_link_libraries(${TARGET_APP} PRIVATE GenericCore)
|
target_link_libraries(${TARGET_APP} PRIVATE BeetRoundCore)
|
||||||
target_include_directories(${TARGET_APP} PRIVATE ${QR_LIB_DIR}/src)
|
target_include_directories(${TARGET_APP} PRIVATE ${QR_LIB_DIR}/src)
|
||||||
target_link_libraries(${TARGET_APP} PRIVATE qrcode)
|
target_link_libraries(${TARGET_APP} PRIVATE qrcode)
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
set(TARGET_APP "GenericCore")
|
set(TARGET_APP "BeetRoundCore")
|
||||||
project(${TARGET_APP} VERSION 0.1.0 LANGUAGES CXX)
|
project(${TARGET_APP} VERSION 0.1.0 LANGUAGES CXX)
|
||||||
|
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
@ -43,8 +43,8 @@ add_library(${TARGET_APP} STATIC
|
|||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
|
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
|
||||||
target_link_libraries(GenericCore PRIVATE Qt${QT_VERSION_MAJOR}::Test)
|
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Test)
|
||||||
target_link_libraries(GenericCore PRIVATE Qt${QT_VERSION_MAJOR}::Network)
|
target_link_libraries(${TARGET_APP} PRIVATE Qt${QT_VERSION_MAJOR}::Network)
|
||||||
|
|
||||||
target_compile_definitions(${TARGET_APP} PRIVATE ${TARGET_APP}_LIBRARY)
|
target_compile_definitions(${TARGET_APP} PRIVATE ${TARGET_APP}_LIBRARY)
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/include)
|
|||||||
target_link_libraries(${TARGET_APP}
|
target_link_libraries(${TARGET_APP}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
GTest::GTest
|
GTest::GTest
|
||||||
GenericCore)
|
BeetRoundCore)
|
||||||
target_link_libraries(${TARGET_APP} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
|
target_link_libraries(${TARGET_APP} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
|
||||||
|
|
||||||
add_test(core_gtests ${TARGET_APP})
|
add_test(core_gtests ${TARGET_APP})
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "../../libs/GenericCore/genericcore.h"
|
#include "../../libs/BeetRoundCore/genericcore.h"
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
inline void PrintTo(const QString& qString, ::std::ostream* os) { *os << qUtf8Printable(qString); }
|
inline void PrintTo(const QString& qString, ::std::ostream* os) { *os << qUtf8Printable(qString); }
|
||||||
|
|||||||
Reference in New Issue
Block a user