Merge pull request #15 from lioncash/cmake

CMakeLists: Migrate Qt checking over to using components

CMakeLists.txt

@@ -123,7 +123,7 @@ if(TARGET boo AND NOT WINDOWS_STORE AND NOT NX)
   endif()
 
   # Editor
-  find_package(Qt5Widgets)
+  find_package(Qt5 COMPONENTS Widgets)
   if (Qt5Widgets_FOUND)
     message(STATUS "Qt5 found, amuse-gui will be built")
     add_subdirectory(Editor)

Editor/CMakeLists.txt

@@ -2,12 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(Qt5Widgets REQUIRED)
+find_package(Qt5 COMPONENTS LinguistTools Network Qml Svg Widgets Xml REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Svg REQUIRED)
-find_package(Qt5Qml REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
 
 if(WIN32)
   list(APPEND PLAT_SRCS platforms/win/amuse-gui.rc platforms/win/amuse-gui.manifest)
@@ -76,12 +71,24 @@ if(COMMAND add_sanitizers)
 endif()
 
 set_target_properties(amuse-gui PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist")
+  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist"
+)
 
-target_link_libraries(amuse-gui ${PLAT_LIBS}
+target_link_libraries(amuse-gui
-        ${Qt5Widgets_LIBRARIES}
+  ${PLAT_LIBS}
-        ${Qt5Network_LIBRARIES}
+
-        ${Qt5Xml_LIBRARIES}
+  Qt5::Network
-        ${Qt5Svg_LIBRARIES}
+  Qt5::Qml
-        ${Qt5Qml_LIBRARIES}
+  Qt5::Svg
-        amuse boo ${BOO_SYS_LIBS} logvisor athena-core xxhash ${ZLIB_LIBRARIES} lzokay)
+  Qt5::Widgets
+  Qt5::Xml
+
+  amuse
+  athena-core
+  boo
+  ${BOO_SYS_LIBS}
+  logvisor
+  lzokay
+  xxhash
+  ${ZLIB_LIBRARIES}
+)