Change Qt 5/6 option

2020-10-01 19:43:39 +02:00
parent 8f9dbfee2c
commit ae6a50626d
11 changed files with 32 additions and 20 deletions
--- a/ext/libstrawberry-common/CMakeLists.txt
+++ b/ext/libstrawberry-common/CMakeLists.txt
@@ -20,7 +20,7 @@ if(APPLE)
  list(APPEND SOURCES core/scoped_nsautorelease_pool.mm)
 endif(APPLE)

-if(WITH_QT6)
+if(BUILD_WITH_QT6)
  qt6_wrap_cpp(MOC ${HEADERS})
 else()
  qt5_wrap_cpp(MOC ${HEADERS})
--- a/ext/libstrawberry-tagreader/CMakeLists.txt
+++ b/ext/libstrawberry-tagreader/CMakeLists.txt
@@ -39,6 +39,6 @@ target_link_libraries(libstrawberry-tagreader PRIVATE
  libstrawberry-common
 )

-if(WITH_QT6)
+if(BUILD_WITH_QT6)
  target_link_libraries(libstrawberry-tagreader PRIVATE Qt6::Core5Compat)
 endif()
--- a/ext/strawberry-tagreader/CMakeLists.txt
+++ b/ext/strawberry-tagreader/CMakeLists.txt
@@ -4,7 +4,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})

 set(SOURCES main.cpp tagreaderworker.cpp)

-if(WITH_QT6)
+if(BUILD_WITH_QT6)
  qt6_wrap_cpp(MOC ${HEADERS})
  qt6_add_resources(QRC data/data.qrc)
 else()