blob: 9459d84c81ca59fed4cd1be41d2f722fff611b34 (
plain) (
blame)
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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
--- CMakeLists.txt.orig 2013-01-16 18:02:17 UTC
+++ CMakeLists.txt
@@ -11,32 +11,32 @@ set(QTKEYCHAIN_SOVERSION 0)
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
include(GNUInstallDirs)
-# try Qt5 first, and prefer that if found
-find_package(Qt5Core QUIET)
-if (Qt5Core_FOUND)
- if(UNIX AND NOT APPLE)
- find_package(Qt5DBus REQUIRED)
- include_directories(${Qt5DBus_INCLUDE_DIRS})
- set(QTDBUS_LIBRARIES ${Qt5DBus_LIBRARIES})
- macro(qt_add_dbus_interface)
- qt5_add_dbus_interface(${ARGN})
- endmacro()
- endif()
- macro(qt_wrap_cpp)
- qt5_wrap_cpp(${ARGN})
- endmacro()
-
- set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES})
- include_directories(${Qt5Core_INCLUDE_DIRS})
-
- if (Qt5_POSITION_INDEPENDENT_CODE)
- if (CMAKE_VERSION VERSION_LESS 2.8.9) # TODO remove once we increase the cmake requirement
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- else()
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
- endif()
-else()
+# Force Qt4
+#find_package(Qt5Core QUIET)
+#if (Qt5Core_FOUND)
+# if(UNIX AND NOT APPLE)
+# find_package(Qt5DBus REQUIRED)
+# include_directories(${Qt5DBus_INCLUDE_DIRS})
+# set(QTDBUS_LIBRARIES ${Qt5DBus_LIBRARIES})
+# macro(qt_add_dbus_interface)
+# qt5_add_dbus_interface(${ARGN})
+# endmacro()
+# endif()
+# macro(qt_wrap_cpp)
+# qt5_wrap_cpp(${ARGN})
+# endmacro()
+#
+# set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES})
+# include_directories(${Qt5Core_INCLUDE_DIRS})
+#
+# if (Qt5_POSITION_INDEPENDENT_CODE)
+# if (CMAKE_VERSION VERSION_LESS 2.8.9) # TODO remove once we increase the cmake requirement
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+# else()
+# set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+# endif()
+# endif()
+#else()
if(UNIX AND NOT APPLE)
find_package(Qt4 COMPONENTS QtCore QtDBus REQUIRED)
macro(qt_add_dbus_interface)
@@ -51,7 +51,7 @@ else()
endif()
include_directories(${QT_INCLUDES})
set(QTCORE_LIBRARIES ${QT_QTCORE_LIBRARY})
-endif()
+#endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
