diff options
| author | Milan Crha <mcrha@redhat.com> | 2019-03-25 09:41:28 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2019-03-25 09:41:28 +0100 |
| commit | 076df9d20cfe81c3aee5aed92c4dfd2d1ae50a2a (patch) | |
| tree | db428c45c47fcc315dd5fd93df8d8b08e43c1768 /cmake | |
| parent | 78d2b90a5257cc5e3ea6915fb4bf128b6ed383f2 (diff) | |
| download | libical-git-076df9d20cfe81c3aee5aed92c4dfd2d1ae50a2a.tar.gz | |
Change the order of the libdirs in the GtkDoc.cmake
This makes sure the just built libraries are found before those
installed in the system.
Diffstat (limited to 'cmake')
| -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 0495e88e..dc907a9e 100644 --- a/cmake/modules/GtkDoc.cmake +++ b/cmake/modules/GtkDoc.cmake @@ -71,9 +71,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${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}) - list(APPEND _scangobj_ldflags -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) - foreach(opt IN LISTS ${_depsvar}) if(TARGET ${opt}) set(_target_type) @@ -97,6 +94,10 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign list(APPEND _scangobj_deps ${opt}) endforeach() + # 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() @@ -118,7 +119,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign if(NOT _output_name) set(_output_name ${opt}) endif() - 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}>") @@ -127,7 +128,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign endif() unset(_target_type) else() - set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}") + set(_scangobj_ldflags "${opt} ${_scangobj_ldflags}") endif() endforeach() |