Browse Source

For Travis CI - attempt to fix Annotator linking issue on CI server.
[ci only: Annotate, Emscripten]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
f9fd477103
3 changed files with 3 additions and 2 deletions
  1. 1 0
      .travis.yml
  2. 1 1
      Source/Clang-Tools/Annotator/CMakeLists.txt
  3. 1 1
      Source/Clang-Tools/CMakeLists.txt

+ 1 - 0
.travis.yml

@@ -178,6 +178,7 @@ before_script:
   - export TRAVIS_COMMIT=$TRAVIS_COMMIT~
   - export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT)
   - git clone --depth 1 https://github.com/urho3d/fastcomp-clang.git && export FASTCOMP_CLANG_ROOT=$(pwd)/fastcomp-clang
+  - export PATH=$(whereis -b ccache |grep -o '\S*lib\S*'):$PATH
   - export CXX=g++-4.9 CC=gcc-4.9
   - for compiler in gcc g++; do ln -s $(which ccache) $HOME/$compiler-4.9; done && export PATH=$HOME:$PATH
   - rake ci_setup_cache

+ 1 - 1
Source/Clang-Tools/Annotator/CMakeLists.txt

@@ -31,7 +31,7 @@ set (LIBS clangRewriteFrontend clangStaticAnalyzerFrontend clangTooling clangSta
         clangFrontend clangDriver clangParse clangSerialization clangSema clangEdit clangAnalysis clangASTMatchers clangAST
         clangToolingCore clangRewrite clangLex clangBasic
         LLVMBitReader LLVMCore LLVMMC LLVMOption LLVMMCParser LLVMSupport
-        z)
+        z tinfo)
 
 # Setup target
 if (APPLE)

+ 1 - 1
Source/Clang-Tools/CMakeLists.txt

@@ -46,7 +46,7 @@ get_target_property (SOURCES Urho3D SOURCES)
 string (REGEX REPLACE "[^;]+\\.h" "" SOURCES "${SOURCES}")   # Stringify to preserve the semicolons
 string (REGEX REPLACE "[^;]+generated[^;]+\\.cpp" "" SOURCES "${SOURCES}")
 add_custom_target (annotate
-    COMMAND ${CMAKE_BINARY_DIR}/bin/tool/Annotator -ast-dump -ast-dump-filter=Urho3D -p ${CMAKE_BINARY_DIR} ${SOURCES}
+    COMMAND ${CMAKE_BINARY_DIR}/bin/tool/Annotator -ast-dump -ast-dump-filter=Urho3D::Audio -p ${CMAKE_BINARY_DIR} ${SOURCES}
     DEPENDS Annotator
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Urho3D
     COMMENT "Annotating Urho3D library source files")