Merge topic 'qt5-qtdialog-port'

25a4f56 Build with Qt5 if it is found.
717f31a Compile with both Qt4 and Qt5.
066e858 Replace two include_directories with a setting.
430ba9f Use add_subdirectory instead of the obsolete subdirs.
32a5725 Remove an if which is always true.
0b6625c Move variable setting down to where it relates to.
8ab312b Use CMake platform variables instead of Qt ones.
bd728f6 Add a return-after-error if an old Qt is found.

3 files changed, 117 insertions, 99 deletions

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index e79689b..242470d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -548,7 +548,7 @@ endif()
 # Qt GUI
 option(BUILD_QtDialog "Build Qt dialog for CMake" FALSE)
 if(BUILD_QtDialog)
-  subdirs(QtDialog)
+  add_subdirectory(QtDialog)
 endif()
 
 include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 0969aea..a1ffa20 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -9,115 +9,129 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
 #=============================================================================
-project(QtDialog)
-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.")
+project(QtDialog)
+find_package(Qt5Widgets QUIET)
+if (Qt5Widgets_FOUND)
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
+  add_definitions(${Qt5Widgets_DEFINITONS})
+  macro(qt4_wrap_ui)
+    qt5_wrap_ui(${ARGN})
+  endmacro()
+  macro(qt4_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qt4_add_resources)
+    qt5_add_resources(${ARGN})
+  endmacro()
+  set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
 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_PACKAGE_QTGUI TRUE)
-  set(SRCS
-    AddCacheEntry.cxx
-    AddCacheEntry.h
-    CMakeSetup.cxx
-    CMakeSetupDialog.cxx
-    CMakeSetupDialog.h
-    FirstConfigure.cxx
-    FirstConfigure.h
-    QCMake.cxx
-    QCMake.h
-    QCMakeCacheView.cxx
-    QCMakeCacheView.h
-    QCMakeWidgets.cxx
-    QCMakeWidgets.h
-    QMacInstallDialog.cxx
-    QMacInstallDialog.h
-    )
-  QT4_WRAP_UI(UI_SRCS
-    CMakeSetupDialog.ui
-    Compilers.ui
-    CrossCompiler.ui
-    AddCacheEntry.ui
-    MacInstallDialog.ui
-    )
-  QT4_WRAP_CPP(MOC_SRCS
-    AddCacheEntry.h
-    Compilers.h
-    CMakeSetupDialog.h
-    FirstConfigure.h
-    QCMake.h
-    QCMakeCacheView.h
-    QCMakeWidgets.h
-    QMacInstallDialog.h
-    )
-  QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
+endif()
 
-  set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
-  if(Q_WS_WIN)
-    set(SRCS ${SRCS} CMakeSetup.rc)
-  endif()
-  if(Q_WS_MAC)
-    set(SRCS ${SRCS} CMakeSetup.icns)
-    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
-    set_source_files_properties(CMakeSetup.icns PROPERTIES
-      MACOSX_PACKAGE_LOCATION Resources)
-  endif()
+set(SRCS
+  AddCacheEntry.cxx
+  AddCacheEntry.h
+  CMakeSetup.cxx
+  CMakeSetupDialog.cxx
+  CMakeSetupDialog.h
+  FirstConfigure.cxx
+  FirstConfigure.h
+  QCMake.cxx
+  QCMake.h
+  QCMakeCacheView.cxx
+  QCMakeCacheView.h
+  QCMakeWidgets.cxx
+  QCMakeWidgets.h
+  QMacInstallDialog.cxx
+  QMacInstallDialog.h
+  )
+QT4_WRAP_UI(UI_SRCS
+  CMakeSetupDialog.ui
+  Compilers.ui
+  CrossCompiler.ui
+  AddCacheEntry.ui
+  MacInstallDialog.ui
+  )
+QT4_WRAP_CPP(MOC_SRCS
+  AddCacheEntry.h
+  Compilers.h
+  CMakeSetupDialog.h
+  FirstConfigure.h
+  QCMake.h
+  QCMakeCacheView.h
+  QCMakeWidgets.h
+  QMacInstallDialog.h
+  )
+QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc)
 
-  include_directories(${CMAKE_CURRENT_BINARY_DIR})
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
+if(WIN32)
+  set(SRCS ${SRCS} CMakeSetup.rc)
+endif()
+if(APPLE)
+  set(SRCS ${SRCS} CMakeSetup.icns)
+  set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+  set_source_files_properties(CMakeSetup.icns PROPERTIES
+    MACOSX_PACKAGE_LOCATION Resources)
+endif()
 
-  add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-  target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
-  if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
-    if(APPLE)
-      set_target_properties(cmake-gui PROPERTIES
-       OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
-    endif()
-    set(CMAKE_INSTALL_DESTINATION_ARGS
-      BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
-  endif()
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-  install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
+add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
+target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
 
-  if(UNIX)
-    # install a desktop file so CMake appears in the application start menu
-    # with an icon
-    install(FILES CMake.desktop DESTINATION share/applications )
-    install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
-    install(FILES cmakecache.xml DESTINATION share/mime/packages )
-  endif()
+if(APPLE)
+  set_target_properties(cmake-gui PROPERTIES
+    OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+endif()
+set(CMAKE_INSTALL_DESTINATION_ARGS
+  BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
 
-  if(APPLE)
-    set(CMAKE_POSTFLIGHT_SCRIPT
-      "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-    set(CMAKE_POSTUPGRADE_SCRIPT
-      "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
-    configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postflight.sh.in"
-      "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
-    configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postupgrade.sh.in"
-      "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
-    install(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
-                  WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
-  endif()
+install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
 
-  if(APPLE OR WIN32)
-    # install rules for including 3rd party libs such as Qt
-    # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
-    set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
-    if(APPLE)
-      set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}")
-    endif()
-    install(CODE "
-      include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
-      set(BU_CHMOD_BUNDLE_ITEMS ON)
-      fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
-    ")
-  endif()
+if(UNIX)
+  # install a desktop file so CMake appears in the application start menu
+  # with an icon
+  install(FILES CMake.desktop DESTINATION share/applications )
+  install(FILES CMakeSetup32.png DESTINATION share/pixmaps )
+  install(FILES cmakecache.xml DESTINATION share/mime/packages )
+endif()
 
-  configure_file("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
-    "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
+if(APPLE)
+  set(CMAKE_POSTFLIGHT_SCRIPT
+    "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
+  set(CMAKE_POSTUPGRADE_SCRIPT
+    "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
+  configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postflight.sh.in"
+    "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
+  configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postupgrade.sh.in"
+    "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh")
+  install(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui
+                WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
+endif()
+
+if(APPLE OR WIN32)
+  # install rules for including 3rd party libs such as Qt
+  # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
+  set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
+  if(APPLE)
+    set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}")
+  endif()
+  install(CODE "
+    include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
+    set(BU_CHMOD_BUNDLE_ITEMS ON)
+    fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
+  ")
 endif()
 
+set(CMAKE_PACKAGE_QTGUI TRUE)
+configure_file("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
+  "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index a2b1567..0d01181 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -348,7 +348,11 @@ void QCMake::interrupt()
 bool QCMake::interruptCallback(void* cd)
 {
   QCMake* self = reinterpret_cast<QCMake*>(cd);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   return self->InterruptFlag;
+#else
+  return self->InterruptFlag.load();
+#endif
 }
 
 void QCMake::progressCallback(const char* msg, float percent, void* cd)