From 8e7f5ea6e8e4c44dd265450912a4c20a61503bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 18 Mar 2018 11:49:15 +0100
Subject: [PATCH] core: fix build with CMake and Ninja

---
 ChangeLog.adoc                       | 7 +++++++
 doc/de/CMakeLists.txt                | 4 +++-
 doc/en/CMakeLists.txt                | 7 +++++--
 doc/fr/CMakeLists.txt                | 7 +++++--
 doc/it/CMakeLists.txt                | 7 +++++--
 doc/ja/CMakeLists.txt                | 7 +++++--
 doc/pl/CMakeLists.txt                | 4 +++-
 src/gui/curses/normal/CMakeLists.txt | 7 +------
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index c3792578d..9921c7815 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -15,6 +15,13 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).
 
 
+[[v2.2]]
+== Version 2.2 (under dev)
+
+Build::
+
+  * core: fix build with CMake and Ninja
+
 [[v2.1]]
 == Version 2.1 (2018-03-18)
 
diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
index c3a0c1b24..6770b9f6c 100644
--- a/doc/de/CMakeLists.txt
+++ b/doc/de/CMakeLists.txt
@@ -48,6 +48,8 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
@@ -56,7 +58,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.de.html"
   )
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index 654c260aa..068258762 100644
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -48,6 +48,9 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+  file(GLOB AUTOGEN_PLUGIN "${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
@@ -56,7 +59,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.en.html"
   )
@@ -70,7 +73,7 @@ if(ENABLE_DOC)
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
+    ${AUTOGEN_PLUGIN}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.en.html"
   )
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
index 83da90a7b..bf134f44d 100644
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -48,6 +48,9 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+  file(GLOB AUTOGEN_PLUGIN "${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
@@ -56,7 +59,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.fr.html"
   )
@@ -70,7 +73,7 @@ if(ENABLE_DOC)
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
+    ${AUTOGEN_PLUGIN}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.fr.html"
   )
diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt
index 0274c1104..eeff86a1f 100644
--- a/doc/it/CMakeLists.txt
+++ b/doc/it/CMakeLists.txt
@@ -48,6 +48,9 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+  file(GLOB AUTOGEN_PLUGIN "${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html
@@ -56,7 +59,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.it.html"
   )
@@ -70,7 +73,7 @@ if(ENABLE_DOC)
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
+    ${AUTOGEN_PLUGIN}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.it.html"
   )
diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt
index b24d0b8c5..a0da159bd 100644
--- a/doc/ja/CMakeLists.txt
+++ b/doc/ja/CMakeLists.txt
@@ -48,6 +48,9 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+  file(GLOB AUTOGEN_PLUGIN "${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.ja.html
@@ -56,7 +59,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.ja.html"
   )
@@ -70,7 +73,7 @@ if(ENABLE_DOC)
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
+    ${AUTOGEN_PLUGIN}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.ja.html"
   )
diff --git a/doc/pl/CMakeLists.txt b/doc/pl/CMakeLists.txt
index 4a81640dc..71c03c73f 100644
--- a/doc/pl/CMakeLists.txt
+++ b/doc/pl/CMakeLists.txt
@@ -48,6 +48,8 @@ endif()
 
 if(ENABLE_DOC)
 
+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.pl.html
@@ -56,7 +58,7 @@ if(ENABLE_DOC)
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.pl.html"
   )
diff --git a/src/gui/curses/normal/CMakeLists.txt b/src/gui/curses/normal/CMakeLists.txt
index f44b2cfcf..b22fcf76c 100644
--- a/src/gui/curses/normal/CMakeLists.txt
+++ b/src/gui/curses/normal/CMakeLists.txt
@@ -63,17 +63,12 @@ target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses_normal ${E
 # This link is created for compatibility with old versions on /upgrade.
 # It may be removed in future.
 add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
+  TARGET ${EXECUTABLE}
   COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
   COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat${CMAKE_EXECUTABLE_SUFFIX}" "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
-  DEPENDS ${EXECUTABLE}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMENT "Creating symbolic link ${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
 )
-add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
-)
-add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
 list(APPEND CMAKE_INSTALL_MANIFEST_FILES "${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
 
 # Install executable and symbolic link