blob: 5480f870dc7cda8bce92a26693f52511882b94b3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- src/geant4.10.00.p02/cmake/Modules/Geant4InterfaceOptions.cmake 2014-06-19 11:56:29.000000000 +0200
+++ Geant4InterfaceOptions.cmake 2014-10-26 19:04:58.407396452 +0100
@@ -88,29 +88,29 @@
find_package(Qt5OpenGL QUIET)
find_package(Qt5PrintSupport QUIET)
- if(Qt5Core_FOUND
- AND Qt5Gui_FOUND
- AND Qt5Widgets_FOUND
- AND Qt5OpenGL_FOUND
- AND Qt5PrintSupport_FOUND)
- # Compatibility
- macro(qt4_wrap_cpp)
- qt5_wrap_cpp(${ARGN})
- endmacro()
- set(Qt5_USE_FILE_IN "${PROJECT_SOURCE_DIR}/cmake/Templates/Geant4UseQt5.cmake.in")
- set(QT_USE_FILE "${PROJECT_BINARY_DIR}/Geant4UseQt5.cmake")
- configure_file("${Qt5_USE_FILE_IN}" "${QT_USE_FILE}" @ONLY)
- get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
- set(G4QTLIBLIST "-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core")
- set(G4GLQTLIBLIST "-lQt5OpenGL ${G4QTLIBLIST}")
- else()
+# if(Qt5Core_FOUND
+# AND Qt5Gui_FOUND
+# AND Qt5Widgets_FOUND
+# AND Qt5OpenGL_FOUND
+# AND Qt5PrintSupport_FOUND)
+# # Compatibility
+# macro(qt4_wrap_cpp)
+# qt5_wrap_cpp(${ARGN})
+# endmacro()
+# set(Qt5_USE_FILE_IN "${PROJECT_SOURCE_DIR}/cmake/Templates/Geant4UseQt5.cmake.in")
+# set(QT_USE_FILE "${PROJECT_BINARY_DIR}/Geant4UseQt5.cmake")
+# configure_file("${Qt5_USE_FILE_IN}" "${QT_USE_FILE}" @ONLY)
+# get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
+# set(G4QTLIBLIST "-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Core")
+# set(G4GLQTLIBLIST "-lQt5OpenGL ${G4QTLIBLIST}")
+# else()
unset(Qt5Core_DIR CACHE)
unset(Qt5Gui_DIR CACHE)
unset(Qt5Widgets_DIR CACHE)
unset(Qt5OpenGL_DIR CACHE)
unset(Qt5PrintSupport_DIR CACHE)
find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtOpenGL)
- endif()
+# endif()
find_package(OpenGL REQUIRED)
|