diff options
| author | Milan Crha <mcrha@redhat.com> | 2019-03-01 12:08:35 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2019-03-01 12:08:35 +0100 |
| commit | 983d3b72959ca8be31e9be59eb0f656e5ef9a004 (patch) | |
| tree | 34287256dd37f1d17f125f45df24a6ce23634131 | |
| parent | 313cbaa8a15784fdbefa7b9b2182924ece881865 (diff) | |
| download | evolution-data-server-983d3b72959ca8be31e9be59eb0f656e5ef9a004.tar.gz | |
Change order of CFLAGS/LDFLAGS passed to gtk-doc
Specifically add the install PREFIX as the last, thus the built
headers and libraries have precedence over those installed.
| -rw-r--r-- | cmake/modules/GtkDoc.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake index 1ed45d8c9..538585589 100644 --- a/cmake/modules/GtkDoc.cmake +++ b/cmake/modules/GtkDoc.cmake @@ -73,9 +73,6 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign set(_scangobj_ldflags "") set(_scangobj_ld_lib_dirs "") - list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) - list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR}) - foreach(opt IN LISTS ${_depsvar}) if(TARGET ${opt}) set(_target_type) @@ -99,6 +96,10 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign list(APPEND _scangobj_deps ${opt}) endforeach(opt) + # Add them as the last, thus in-tree headers/libs have precedence + list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) + list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR}) + if(_scangobj_deps) list(REMOVE_DUPLICATES _scangobj_deps) endif(_scangobj_deps) @@ -120,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign if(NOT _output_name) set(_output_name ${opt}) endif(NOT _output_name) - set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}") + set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}") if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY")) set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>") @@ -129,7 +130,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign endif((_target_type STREQUAL "STATIC_LIBRARY") OR (_target_type STREQUAL "SHARED_LIBRARY") OR (_target_type STREQUAL "MODULE_LIBRARY")) unset(_target_type) else(TARGET ${opt}) - set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}") + set(_scangobj_ldflags "${opt} ${_scangobj_ldflags}") endif(TARGET ${opt}) endforeach(opt) |