qt6 versionless targets
This commit is contained in:
parent
b3ee265745
commit
745d62f4a1
|
@ -1,21 +1,14 @@
|
|||
cmake_minimum_required(VERSION 3.21.1)
|
||||
|
||||
project(sacnExplorer VERSION 1.1.1 LANGUAGES CXX)
|
||||
|
||||
find_package(QT NAMES Qt5 Qt6 COMPONENTS Widgets REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Widgets REQUIRED)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||
qt_add_executable(${PROJECT_NAME} MANUAL_FINALIZATION)
|
||||
else()
|
||||
if(ANDROID)
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
else()
|
||||
add_executable(${PROJECT_NAME})
|
||||
endif()
|
||||
endif()
|
||||
add_executable(${PROJECT_NAME})
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
|
@ -43,7 +36,7 @@ target_sources(${PROJECT_NAME}
|
|||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
Qt::Widgets
|
||||
QsACN
|
||||
)
|
||||
|
||||
|
@ -52,9 +45,3 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
|
|||
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
|
||||
)
|
||||
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
qt_finalize_executable(${PROJECT_NAME})
|
||||
endif()
|
||||
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
cmake_minimum_required(VERSION 3.21.1)
|
||||
|
||||
project(QsACN VERSION 0.1 LANGUAGES CXX)
|
||||
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 COMPONENTS Network REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Network REQUIRED)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
|
@ -19,7 +18,7 @@ target_sources(${PROJECT_NAME}
|
|||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
Qt${QT_VERSION_MAJOR}::Network
|
||||
Qt::Network
|
||||
LCP
|
||||
)
|
||||
|
||||
|
|
|
@ -4,9 +4,11 @@ project(LCP VERSION 0.2.0 LANGUAGES CXX)
|
|||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC OFF)
|
||||
set(CMAKE_AUTOMOC OFF)
|
||||
set(CMAKE_AUTORCC OFF)
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
|
||||
endif()
|
||||
|
|
|
@ -1,14 +1,24 @@
|
|||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
project(Tests LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_AUTOUIC OFF)
|
||||
set(CMAKE_AUTOMOC OFF)
|
||||
set(CMAKE_AUTORCC OFF)
|
||||
|
||||
find_package(GTest)
|
||||
if (GTest_FOUND)
|
||||
file(GLOB SRCS *.cpp)
|
||||
add_executable(Tests ${SRCS})
|
||||
target_link_libraries(Tests PUBLIC
|
||||
GTest::gtest
|
||||
LCP
|
||||
)
|
||||
target_include_directories(Tests PUBLIC
|
||||
${GTEST_INCLUDE_DIRS} # doesn't do anything on Linux
|
||||
)
|
||||
gtest_discover_tests(Tests)
|
||||
add_executable(${PROJECT_NAME} ${SRCS})
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
GTest::gtest
|
||||
LCP
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${GTEST_INCLUDE_DIRS} # doesn't do anything on Linux
|
||||
)
|
||||
gtest_discover_tests(${PROJECT_NAME})
|
||||
endif()
|
||||
|
|
Loading…
Reference in New Issue