diff options
| author | Allen Winter <allen.winter@kdab.com> | 2019-01-01 12:04:26 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2019-01-01 12:04:26 -0500 |
| commit | 79c3c0620dafb9a660c52364f52acf2a50d7a88c (patch) | |
| tree | a4997c969b2ba5936ec671d2fead69c554faf40b /cmake | |
| parent | 0c5f95c54cba7a64871a548ae2eb9bfbf0ba3a23 (diff) | |
| download | libical-git-79c3c0620dafb9a660c52364f52acf2a50d7a88c.tar.gz | |
cmake/modules/GtkDoc.cmake - pull over changes from master
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/GtkDoc.cmake | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake index c480b86f..0495e88e 100644 --- a/cmake/modules/GtkDoc.cmake +++ b/cmake/modules/GtkDoc.cmake @@ -59,9 +59,10 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign list(APPEND _filedeps ${_files}) endforeach() - set(_mkhtml_prefix "") if(APPLE) - set(_mkhtml_prefix "${CMAKE_COMMAND} -E env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"") + if(NOT DEFINED ENV{XML_CATALOG_FILES}) + message(FATAL_ERROR "On OSX, please run \'export XML_CATALOG_FILES=/usr/local/etc/xml/catalog\' first; else the gtk entities cannot be located.") + endif() endif() set(_scangobj_deps) @@ -70,8 +71,8 @@ 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}) + 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}) @@ -132,13 +133,13 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}") - if(NOT (_scangobj_cflags STREQUAL "")) - set(_scangobj_cflags --cflags "${_scangobj_cflags}") - endif() +# if(NOT (_scangobj_cflags STREQUAL "")) +# set(_scangobj_cflags --cflags "${_scangobj_cflags}") +# endif() - if(NOT (_scangobj_ldflags STREQUAL "")) - set(_scangobj_ldflags --ldflags "${_scangobj_ldflags}") - endif() +# if(NOT (_scangobj_ldflags STREQUAL "")) +# set(_scangobj_ldflags "--ldflags ${_scangobj_ldflags}") +# endif() add_custom_command(OUTPUT html/index.html COMMAND ${GTKDOC_SCAN} @@ -151,8 +152,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}" ${_scangobj_prefix} ${GTKDOC_SCANGOBJ} --module=${_module} - ${_scangobj_cflags} - ${_scangobj_ldflags} + --cflags=${_scangobj_cflags} + --ldflags=${_scangobj_ldflags} COMMAND ${GTKDOC_MKDB} --module=${_module} @@ -164,7 +165,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/html" - COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/html" ${_mkhtml_prefix} ${GTKDOC_MKHTML} --path=.. ${_module} ../${_module}-docs.sgml + COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/html" ${GTKDOC_MKHTML} --path=.. ${_module} ../${_module}-docs.sgml COMMAND ${GTKDOC_FIXXREF} --module=${_module} |