diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-15 14:24:56 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-15 14:24:56 (GMT) |
| commit | dacdb42c998ecb383c2c9dede7cdaece42b1165e (patch) | |
| tree | 37aaaa7943b20237d72981de0280911b5e02db67 | |
| parent | bcd9011465e97880c475b38aa68e266e07c62fe1 (diff) | |
| parent | 2613bf77ccbeee4721a17a8168dead071e41b45e (diff) | |
| download | Doxygen-dacdb42c998ecb383c2c9dede7cdaece42b1165e.zip Doxygen-dacdb42c998ecb383c2c9dede7cdaece42b1165e.tar.gz Doxygen-dacdb42c998ecb383c2c9dede7cdaece42b1165e.tar.bz2 | |
Merge pull request #132 from mr-c/clangfix
pass libclang header file location; add paths for Ubuntu's llvm-3.4
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | src/libdoxygen.pro.in | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -554,8 +554,8 @@ 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" + libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include /usr/lib/llvm-3.4/include" + libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/llvm-3.4/lib" if test "$f_libclangstatic" = NO; then libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a" else @@ -941,7 +941,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_LIBS%%;$libclang_link;g" -e "s;%%LIBCLANG_INC%%;$libclang_hdr;g" >> $DST echo " Created $DST from $SRC..." done diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 457db58..bc680ea 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -224,6 +224,7 @@ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions linux-g++:TMAKE_CXXFLAGS += -fno-exceptions INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5 INCLUDEPATH += %%SQLITE3_INC%% +INCLUDEPATH += %%LIBCLANG_INC%% DEPENDPATH += ../generated_src/doxygen win32:INCLUDEPATH += . DESTDIR = ../lib |