[evolution-data-server] Bug 775597 - Add -L flags set in LDFLAGS to g-ir-scanner command line



commit 6c50dbcccaeb28eccc001945096cf52191a4f78f
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Dec 6 12:09:36 2016 +0100

    Bug 775597 - Add -L flags set in LDFLAGS to g-ir-scanner command line

 cmake/modules/GObjectIntrospection.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
index 6d4d0a8..5b3c845 100644
--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -211,6 +211,9 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
        _gir_list_prefix(_gir_extra_libdirs ${gir_extra_libdirs_var} "--library-path=")
        _gir_list_prefix(_gir_deps ${gir_deps_var} "--include-uninstalled=")
 
+       string(REGEX MATCHALL "-L[^ ]*"
+               _extra_library_path "${CMAKE_SHARED_LINKER_FLAGS}")
+
        set(INTROSPECTION_SCANNER_ARGS
                --add-include-path=${CMAKE_BINARY_DIR}
                --add-include-path=${CMAKE_BINARY_DIR}/src
@@ -225,6 +228,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
                ${_gir_identifies_prefixes}
                ${_gir_deps}
                --library-path=${LIB_INSTALL_DIR}
+               ${_extra_library_path}
                --pkg-export ${pkg_export_prefix}-${gir_library_version}
                --c-include=${c_include}
                --cflags-begin


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]