Skip to content

Commit cf38e9c

Browse files
committed
Updated CMake files.
CMake version raised up to 3.10.0 Removed not needed files (moved to plugins and iris long time ago) Iris relinked.
1 parent 3d32782 commit cf38e9c

19 files changed

+32
-549
lines changed

3rdparty/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22

33
if( UNIX OR IS_WEBENGINE )
44
include(qhttp.cmake)

3rdparty/qhttp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22

33
if(NOT CMAKE_BUILD_TYPE)
44
set(CMAKE_BUILD_TYPE "Release")

CMakeLists.txt

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2.0)
2-
# Set automoc and autouic policy
3-
if(POLICY CMP0071)
4-
if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
5-
cmake_policy(SET CMP0071 OLD)
6-
message(STATUS "CMP0071 policy set to OLD")
7-
else()
8-
cmake_policy(SET CMP0071 NEW)
9-
message(STATUS "CMP0071 policy set to NEW")
10-
endif()
11-
endif()
12-
if(POLICY CMP0074)
13-
cmake_policy(SET CMP0074 NEW)
14-
message(STATUS "CMP0074 policy set to NEW")
15-
endif()
1+
cmake_minimum_required(VERSION 3.10.0)
162

173
if(NOT CMAKE_BUILD_TYPE)
184
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
@@ -125,6 +111,8 @@ set( GLOBAL_DEPENDS_DEBUG_MODE ON )
125111

126112
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
127113

114+
include(policyRules)
115+
128116
set(IS_WEBKIT OFF CACHE INTERNAL "Use webkit. Internal variable")
129117
set(IS_WEBENGINE OFF CACHE INTERNAL "Use webengine. Internal variable")
130118
string(TOLOWER "${CHAT_TYPE}" LCHAT_TYPE)
@@ -137,7 +125,7 @@ if("${LCHAT_TYPE}" STREQUAL "webkit")
137125
message(STATUS "Chatlog type - QtWebKit")
138126
elseif("${LCHAT_TYPE}" STREQUAL "webengine")
139127
set(IS_WEBENGINE ON)
140-
find_package( Qt5Core 5.6.0 REQUIRED )
128+
find_package( Qt5Core 5.9.0 REQUIRED )
141129
add_definitions(
142130
-DWEBKIT
143131
-DWEBENGINE=1

INSTALL.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See "Packages and installers" section in [README.md](README.md) or [README.html]
99

1010
* compiler with C++17 support
1111
* ccache (optional)
12-
* cmake >= 3.2.0
12+
* cmake >= 3.10.0
1313
* Qt >= 5.9.0 && Qt < 6.0
1414
* QtWebKit (optional)
1515
* QtWebEngine (optional)
@@ -134,4 +134,3 @@ To be written...
134134
[cross-compilation-using-mxe](https://github.com/psi-plus/maintenance/tree/master/scripts/win32/cross-compilation-using-mxe)
135135

136136
To be continued...
137-

cmake/modules/FindLibGcrypt.cmake

-90
This file was deleted.

cmake/modules/FindLibGpgError.cmake

-90
This file was deleted.

cmake/modules/FindLibOtr.cmake

-80
This file was deleted.

0 commit comments

Comments
 (0)