From c80aecbfc14c9d63d45629da7e44f9fdbb0a2e00 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 2 Dec 2018 17:33:20 +0100
Subject: [PATCH] CMake: Put include and link commands on one line

Use correct check for LIBICONV.
---
 build/cmake/lib/base/CMakeLists.txt    |  4 ++--
 build/cmake/lib/core/CMakeLists.txt    | 20 +++++---------------
 build/cmake/lib/webview/CMakeLists.txt |  4 +---
 build/cmake/lib/xml/CMakeLists.txt     |  4 +---
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt
index 0cf6a46860..8f526afebe 100644
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -31,8 +31,8 @@ wx_add_library(base IS_BASE ${BASE_FILES})
 if(NOT wxBUILD_MONOLITHIC)
     wx_lib_compile_definitions(base PRIVATE wxUSE_BASE=1)
 endif()
-if(wxUSE_ZLIB)
 
+if(wxUSE_ZLIB)
     wx_lib_include_directories(base PRIVATE ${ZLIB_INCLUDE_DIRS})
     wx_lib_link_libraries(base PRIVATE ${ZLIB_LIBRARIES})
 endif()
@@ -48,7 +48,7 @@ if(UNIX AND wxUSE_SECRETSTORE)
     wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS})
     wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES})
 endif()
-if(wxUSE_LIBICONV AND ICONV_LIBRARIES)
+if(wxUSE_LIBICONV AND ICONV_FOUND)
     wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS})
     wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES})
 endif()
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index 38f9677970..54c2810051 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -65,27 +65,17 @@ foreach(lib JPEG PNG TIFF)
 endforeach()
 
 if(WIN32)
-    wx_lib_link_libraries(core PRIVATE
-        winmm
-    )
+    wx_lib_link_libraries(core PRIVATE winmm)
 endif()
 if(WXOSX_COCOA)
-    wx_lib_link_libraries(core PUBLIC
-        "-framework AudioToolbox"
-        )
+    wx_lib_link_libraries(core PUBLIC "-framework AudioToolbox")
     if(wxUSE_WEBKIT)
-        wx_lib_link_libraries(core PUBLIC
-            "-framework WebKit"
-            )
+        wx_lib_link_libraries(core PUBLIC "-framework WebKit")
     endif()
 endif()
 if(WXGTK AND wxUSE_PRIVATE_FONTS)
-    wx_lib_include_directories(core PUBLIC
-        ${FONTCONFIG_INCLUDE_DIR}
-    )
-    wx_lib_link_libraries(core PUBLIC
-        ${FONTCONFIG_LIBRARIES}
-    )
+    wx_lib_include_directories(core PUBLIC ${FONTCONFIG_INCLUDE_DIR})
+    wx_lib_link_libraries(core PUBLIC ${FONTCONFIG_LIBRARIES})
 endif()
 if(UNIX AND wxUSE_LIBSDL)
     if(SDL2_FOUND)
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index 8ec75c726d..8de7e67bd2 100644
--- a/build/cmake/lib/webview/CMakeLists.txt
+++ b/build/cmake/lib/webview/CMakeLists.txt
@@ -33,9 +33,7 @@ if(wxUSE_WEBVIEW_WEBKIT2)
 endif()
 
 if(APPLE)
-    wx_lib_link_libraries(webview PUBLIC
-        "-framework WebKit"
-        )
+    wx_lib_link_libraries(webview PUBLIC "-framework WebKit")
 elseif(WXGTK)
     if(LIBSOUP_FOUND)
         wx_lib_include_directories(webview PUBLIC ${LIBSOUP_INCLUDE_DIRS})
diff --git a/build/cmake/lib/xml/CMakeLists.txt b/build/cmake/lib/xml/CMakeLists.txt
index 21173c5ad1..3eaae0b5d1 100644
--- a/build/cmake/lib/xml/CMakeLists.txt
+++ b/build/cmake/lib/xml/CMakeLists.txt
@@ -11,9 +11,7 @@ include(../../source_groups.cmake)
 
 wx_append_sources(XML_FILES XML)
 wx_add_library(xml IS_BASE ${XML_FILES})
-wx_lib_link_libraries(xml
-    PRIVATE ${EXPAT_LIBRARIES}
-    )
+wx_lib_link_libraries(xml PRIVATE ${EXPAT_LIBRARIES})
 wx_lib_include_directories(xml PRIVATE ${EXPAT_INCLUDE_DIRS})
 
 wx_finalize_lib(xml)