Author: jghali
Date: Wed May 25 00:26:33 2022
New Revision: 25091
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=25091
Log:
Remove -DWANT_QT6 cmake option as Qt6 will never be supported in 1.5.x branch
Modified:
branches/Version15x/Scribus/CMakeLists.txt
branches/Version15x/Scribus/scribus/CMakeLists.txt
Modified: branches/Version15x/Scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=25091&path=/branches/Version15x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version15x/Scribus/CMakeLists.txt (original)
+++ branches/Version15x/Scribus/CMakeLists.txt Wed May 25 00:26:33 2022
@@ -9,9 +9,6 @@
#Require 3.14 for new Fontconfig module
cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-if (WANT_QT6)
- cmake_minimum_required(VERSION 3.16.0)
-endif()
cmake_policy(SET CMP0048 NEW)
message(STATUS "CMake Version: ${CMAKE_VERSION}")
if (WANT_PCH)
@@ -395,9 +392,6 @@
#C++11 Support
#as of 1.5.5.svn, require C++11
-if (WANT_QT6)
- set (WANT_CPP17 ON)
-endif()
if(NOT WANT_CPP14 AND NOT WANT_CPP17)
message(STATUS "Enabling C++11 compiler features")
set(CMAKE_CXX_STANDARD 11)
Modified: branches/Version15x/Scribus/scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=25091&path=/branches/Version15x/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version15x/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version15x/Scribus/scribus/CMakeLists.txt Wed May 25 00:26:33 2022
@@ -5,11 +5,7 @@
# a custom target that is always built
if (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
- if (WANT_QT6)
- add_custom_target(svnheader ALL COMMAND
${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P
${CMAKE_SOURCE_DIR}/cmake/modules/getsvn.cmake BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/svnversion.h)
- else()
- add_custom_target(svnheader ALL COMMAND
${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P
${CMAKE_MODULE_PATH}/getsvn.cmake BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/svnversion.h)
- endif()
+ add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND}
-DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_MODULE_PATH}/getsvn.cmake
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h)
else ()
add_custom_target(svnheader ALL DEPENDS svn_header ) #
svn_header is nothing more than a unique string
# creates svnheader.h using cmake script
@@ -765,28 +761,17 @@
message("RPATH: ${CMAKE_INSTALL_RPATH}")
-IF(NOT WANT_QT6)
- target_link_libraries(${EXE_NAME}
- PUBLIC
- ${Qt5Core_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5Gui_LIBRARIES}
- ${Qt5Xml_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5OpenGL_LIBRARIES}
- PRIVATE
- ${Qt5PrintSupport_LIBRARIES}
- )
-else()
- target_link_libraries(${EXE_NAME}
- PUBLIC
- Qt6::Core
- Qt6::Core5Compat
- Qt6::Gui
- Qt6::Widgets
- Qt6::Network
- )
-endif()
+target_link_libraries(${EXE_NAME}
+ PUBLIC
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Widgets_LIBRARIES}
+ ${Qt5Gui_LIBRARIES}
+ ${Qt5Xml_LIBRARIES}
+ ${Qt5Network_LIBRARIES}
+ ${Qt5OpenGL_LIBRARIES}
+ PRIVATE
+ ${Qt5PrintSupport_LIBRARIES}
+)
target_link_libraries(${EXE_NAME}
PUBLIC
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
