casa-mp-base

--- Source/QtDialog/CMakeLists.txt.orig

+++ Source/QtDialog/CMakeLists.txt

@@ -4,7 +4,9 @@

 project(QtDialog)

 CMake_OPTIONAL_COMPONENT(cmake-gui)

 find_package(Qt5Widgets QUIET)

-if (Qt5Widgets_FOUND)

+if(NOT Qt5Widgets_FOUND)

+  message(FATAL_ERROR "Qt5 required but not found")

+endif()

   include_directories(${Qt5Widgets_INCLUDE_DIRS})

   add_definitions(${Qt5Widgets_DEFINITONS})

   macro(qt4_wrap_ui)

@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)

       get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)

     endif()

   endif()

-else()

-  set(QT_MIN_VERSION "4.4.0")

-  find_package(Qt4 REQUIRED)

-  if(NOT QT4_FOUND)

-    message(SEND_ERROR "Failed to find Qt 4.4 or greater.")

-    return()

-  endif()

-

-  include(${QT_USE_FILE})

-

-  set(CMake_QT_LIBRARIES ${QT_LIBRARIES})

-

-endif()

 set(SRCS

   AddCacheEntry.cxx

@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})

 if(WIN32)

   set(SRCS ${SRCS} CMakeSetup.rc)

 endif()

-if(APPLE)

+if(APPLEBUNDLE)

   set(SRCS ${SRCS} CMakeSetup.icns)

   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)

   set_source_files_properties(CMakeSetup.icns PROPERTIES

@@ -171,7 +160,7 @@ endif()

 set(CMAKE_INCLUDE_CURRENT_DIR ON)

-add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})

+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})

 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})

 if(WIN32)

@@ -197,7 +186,7 @@ Checks: '-*,llvm-twine-local'

 ...

 ")

-if(APPLE)

+if(APPLEBUNDLE)

   file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line

     LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")

@@ -243,7 +232,7 @@ if(UNIX AND NOT APPLE)

     ${COMPONENT})

 endif()