diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/socketapi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/testutils/CMakeLists.txt | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27aac59b8..bb6145e8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.16) set(CMAKE_CXX_STANDARD 17) include(VERSION.cmake) diff --git a/src/gui/socketapi/CMakeLists.txt b/src/gui/socketapi/CMakeLists.txt index 78ce96cfd..ed2f94428 100644 --- a/src/gui/socketapi/CMakeLists.txt +++ b/src/gui/socketapi/CMakeLists.txt @@ -4,5 +4,5 @@ target_sources(owncloudCore PRIVATE ) if( APPLE ) - target_sources(owncloudCore PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/socketapisocket_mac.mm) + target_sources(owncloudCore PRIVATE socketapisocket_mac.mm) endif() diff --git a/test/testutils/CMakeLists.txt b/test/testutils/CMakeLists.txt index a27fa720b..ba8012070 100644 --- a/test/testutils/CMakeLists.txt +++ b/test/testutils/CMakeLists.txt @@ -3,10 +3,5 @@ target_link_libraries(syncenginetestutils PUBLIC owncloudCore Qt5::Test) # testutilsloader.cpp uses Q_COREAPP_STARTUP_FUNCTION which can't used reliably in a static lib # therefore we compile it in the tests -if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") - add_library(testutilsloader OBJECT testutilsloader.cpp) - target_link_libraries(testutilsloader PUBLIC owncloudCore) -else() - add_library(testutilsloader INTERFACE) - target_sources(testutilsloader INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/testutilsloader.cpp) -endif() +add_library(testutilsloader OBJECT testutilsloader.cpp) +target_link_libraries(testutilsloader PUBLIC owncloudCore)
\ No newline at end of file |