Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

[lyx.git] / 3rdparty / libiconv / CMakeLists.txt

diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt
index 210d0c2e652a089e2caa5ff73e8a04162122f949..39beb96fbf66bed6be220d51f89f5209a5aca07b 100644 (file)
--- a/3rdparty/libiconv/CMakeLists.txt
+++ b/3rdparty/libiconv/CMakeLists.txt
@@ -5,11 +5,20 @@
 # Please note that the package source code is licensed under its own license.
 
 project ( libiconv C )
-cmake_minimum_required ( VERSION 2.8 )
+cmake_minimum_required(VERSION 3.1)
+
+set(LYX_IPO_SUPPORTED FALSE)
+if (POLICY CMP0069)
+  cmake_policy(SET CMP0069 NEW)
+  if (LYX_USE_IPO MATCHES "ON")
+    set(LYX_IPO_SUPPORTED YES)
+  endif()
+endif()
+
 set(CMAKE_MODULE_PATH .)
 include ( configure.cmake )
 
-set(LIBICONV_VERSION 1.14)
+set(LIBICONV_VERSION 1.15)
 
 set(SRCDIR ${LIBICONV_VERSION})
 
@@ -54,4 +63,6 @@ set(ICONV_INCLUDE_DIR ${BINDIR}/include CACHE STRING "libiconv include  dir" FOR
 set(ICONV_LIBRARY iconv CACHE STRING "libiconv library" FORCE)
 set(ICONV_FOUND iconv CACHE STRING "libiconv found" FORCE)
 
-set_target_properties(iconv PROPERTIES FOLDER "3rd_party")
+set_target_properties(iconv PROPERTIES
+       FOLDER "3rd_party"
+       INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})