diff options
| author | Stefan Sauer <ensonic@hora-obscura.de> | 2018-10-15 19:02:57 +0000 |
|---|---|---|
| committer | Stefan Sauer <ensonic@hora-obscura.de> | 2018-10-15 19:02:57 +0000 |
| commit | 3f5da7372410af303cf761401561c6fd46656a5b (patch) | |
| tree | 0a21e9aeb13664ef2b75b8cd8ffdb2c70f290775 /buildsystems | |
| parent | 64a66f7d69c5269887e14ed9cb8dd962cfd4d839 (diff) | |
| parent | 3145e62c1eb4a151b5f854e5f18908bd1cf339da (diff) | |
| download | gtk-doc-3f5da7372410af303cf761401561c6fd46656a5b.tar.gz | |
Merge branch 'wip/tintou/gobj-args' into 'master'
cmake: use correct flags escaping and actually check if the LD_LIBRAY_PATH variable is defined
See merge request GNOME/gtk-doc!11
Diffstat (limited to 'buildsystems')
| -rw-r--r-- | buildsystems/cmake/GtkDocScanGObjWrapper.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake index 4ad7d2e..7292108 100644 --- a/buildsystems/cmake/GtkDocScanGObjWrapper.cmake +++ b/buildsystems/cmake/GtkDocScanGObjWrapper.cmake @@ -29,19 +29,19 @@ if(NOT APPLE) pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0) foreach(_flag ${EXTRA_CFLAGS} ${GLIB_CFLAGS}) - set(ENV{CFLAGS} "$ENV{CFLAGS} \"${_flag}\"") + set(ENV{CFLAGS} "$ENV{CFLAGS} '${_flag}'") endforeach(_flag) foreach(_flag ${EXTRA_LDFLAGS} ${GLIB_LDFLAGS}) - set(ENV{LDFLAGS} "$ENV{LDFLAGS} \"${_flag}\"") + set(ENV{LDFLAGS} "$ENV{LDFLAGS} '${_flag}'") endforeach(_flag) foreach(_flag ${EXTRA_LDPATH}) - if(ENV{LD_LIBRARY_PATH}) - set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:\"${_flag}\"") - else(ENV{LD_LIBRARY_PATH}) + if(DEFINED ENV{LD_LIBRARY_PATH}) + set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${_flag}") + else(DEFINED ENV{LD_LIBRARY_PATH}) set(ENV{LD_LIBRARY_PATH} "${_flag}") - endif(ENV{LD_LIBRARY_PATH}) + endif(DEFINED ENV{LD_LIBRARY_PATH}) endforeach(_flag) message(STATUS "Executing gtkdoc-scangobj with:") |