LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

some bug fixing in the cmake chain concerning the new Qt6 stuff.

Browse Source
This commit is contained in:
suter_a 2021-01-23 10:21:55 +01:00
parent ad9cf0abf9
commit 9cc9792054
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -123,14 +123,16 @@ if (qt_based_tools)
find_package(Qt6PrintSupport CONFIG REQUIRED) find_package(Qt6PrintSupport CONFIG REQUIRED)
endif (Qt6Core_FOUND) endif (Qt6Core_FOUND)
# try Qt5 # try Qt5
if (NOT Qt6Core_FOUND)
find_package(Qt5Core) find_package(Qt5Core)
if (NOT Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5Xml CONFIG REQUIRED) find_package(Qt5Xml CONFIG REQUIRED)
find_package(Qt5Network CONFIG REQUIRED) find_package(Qt5Network CONFIG REQUIRED)
find_package(Qt5Svg CONFIG REQUIRED) find_package(Qt5Svg CONFIG REQUIRED)
find_package(Qt5PrintSupport CONFIG REQUIRED) find_package(Qt5PrintSupport CONFIG REQUIRED)
endif (NOT Qt5Core_FOUND) endif (Qt5Core_FOUND)
endif (NOT Qt6Core_FOUND)
# if Qt6 and Qt5 is not found, try Qt4 # if Qt6 and Qt5 is not found, try Qt4
if (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND) if (NOT Qt6Core_FOUND AND NOT Qt5Core_FOUND)

2
src/CMakeLists.txt
View File

@ -9,7 +9,7 @@ elseif (Qt4_FOUND)
add_subdirectory(musredit) add_subdirectory(musredit)
elseif (QT_FOUND) elseif (QT_FOUND)
add_subdirectory(musrgui) add_subdirectory(musrgui)
endif (Qt5Core_FOUND) endif ()
#--- define the musrfit libs -------------------------------------------------- #--- define the musrfit libs --------------------------------------------------
set(MUSRFIT_LIBS ${MUSRFIT_LIBS} mud) set(MUSRFIT_LIBS ${MUSRFIT_LIBS} mud)