[gtk-doc: 2/2] Merge branch 'tintou/cmake-no-dup-flags' into 'master'
- From: Stefan Sauer <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc: 2/2] Merge branch 'tintou/cmake-no-dup-flags' into 'master'
- Date: Sun, 31 Mar 2019 10:50:01 +0000 (UTC)
commit 16187aabb37a283a0ae7f916ea612ccb805a8dd1
Merge: 8e47e3f 0a7a1a8
Author: Stefan Sauer <ensonic hora-obscura de>
Date: Sun Mar 31 10:49:48 2019 +0000
Merge branch 'tintou/cmake-no-dup-flags' into 'master'
cmake: Avoid duplicate flags
See merge request GNOME/gtk-doc!24
buildsystems/cmake/GtkDocConfig.cmake | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --cc buildsystems/cmake/GtkDocConfig.cmake
index ea77ab4,c26e679..e6815a0
--- a/buildsystems/cmake/GtkDocConfig.cmake
+++ b/buildsystems/cmake/GtkDocConfig.cmake
@@@ -158,8 -158,17 +158,17 @@@ function(gtk_doc_add_module _doc_prefix
list(APPEND _extra_ldpath ${library_dir})
endforeach()
+ list(REMOVE_DUPLICATES _extra_cflags)
+ list(SORT _extra_cflags)
+
+ list(REMOVE_DUPLICATES _extra_ldflags)
+ list(SORT _extra_ldflags)
+
+ list(REMOVE_DUPLICATES _extra_ldpath)
+ list(SORT _extra_ldpath)
+
# a directory to store output.
- set(_output_dir "${CMAKE_CURRENT_BINARY_DIR}/${_doc_prefix}")
+ set(_output_dir "${CMAKE_CURRENT_BINARY_DIR}")
set(_output_dir_stamp "${_output_dir}/dir.stamp")
# set default sgml file if not specified
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]