diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-10-21 18:05:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-10-21 18:05:13 (GMT) |
| commit | 0f100cabf9d66a9d0ddc93d0d43df82aa25792a5 (patch) | |
| tree | 01780d5ec6f2e6d954f909b5efde78864c4fdb1e | |
| parent | a6c6c59d9b6cc05b9c92b23b5b1840832ed93d81 (diff) | |
| parent | 61e07f8ea2d0d2a2f001b1f657d3d5bbe44e7690 (diff) | |
| download | Doxygen-0f100cabf9d66a9d0ddc93d0d43df82aa25792a5.zip Doxygen-0f100cabf9d66a9d0ddc93d0d43df82aa25792a5.tar.gz Doxygen-0f100cabf9d66a9d0ddc93d0d43df82aa25792a5.tar.bz2 | |
Merge pull request #238 from frosteyes/master
Updated configuration script and libdoxygen.pro.in to use llvm-config
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | src/libdoxygen.pro.in | 1 |
2 files changed, 9 insertions, 3 deletions
@@ -554,8 +554,13 @@ fi if test "$f_libclang" = YES; then printf " Checking for libclang ... " - libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include" - libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm" + if llvm-config --version > /dev/null 2>&1; then + libclang_hdr_dir=$(llvm-config --includedir) + libclang_lib_dir=$(llvm-config --libdir) + else + libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include" + libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm" + fi if test "$f_libclangstatic" = NO; then libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a" else @@ -952,7 +957,7 @@ EOF #if test "$f_thread" = YES; then # realopts="$realopts thread" #fi - cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST + cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_INC%%;$libclang_hdr_dir;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST echo " Created $DST from $SRC..." done diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 703b885..c5943c6 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -230,6 +230,7 @@ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions linux-g++:TMAKE_CXXFLAGS += -fno-exceptions INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5 ../vhdlparser INCLUDEPATH += %%SQLITE3_INC%% +INCLUDEPATH += %%LIBCLANG_INC%% DEPENDPATH += ../generated_src/doxygen win32:INCLUDEPATH += . DESTDIR = ../lib |