diff --git a/.travis.yml b/.travis.yml index f5357f0..631cd65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ install: script: - mkdir build/ && cd build/ - - $CMAKE -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Werror -pedantic -Wall -Wextra -Wconversion -Wsign-conversion -Wno-parentheses -Wno-assume" ../ -DCPPAST_TEST_GCOV=$CPPAST_TEST_GCOV -DLLVM_CONFIG_BINARY=$LLVM_CONFIG_BINARY + - $CMAKE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Werror -pedantic -Wall -Wextra -Wconversion -Wsign-conversion -Wno-parentheses -Wno-assume" ../ -DCPPAST_TEST_GCOV=$CPPAST_TEST_GCOV -DLLVM_CONFIG_BINARY=$LLVM_CONFIG_BINARY - $CMAKE --build . - if [[ "$LLVM_VERSION" == "4.0" ]]; then ./test/cppast_test \*; else ./test/cppast_test; fi diff --git a/appveyor.yml b/appveyor.yml index c606c3b..b17aeb8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,4 +8,4 @@ build_script: - cmd: cmake --build . -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal test_script: - - cmd: test\Debug\cppast_test.exe * + - cmd: test\Debug\cppast_test.exe * ~cppast diff --git a/src/libclang/preprocessor.cpp b/src/libclang/preprocessor.cpp index 157317c..adb1eea 100644 --- a/src/libclang/preprocessor.cpp +++ b/src/libclang/preprocessor.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f4ed9a8..eed8c47 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -45,7 +45,8 @@ add_executable(cppast_test test.cpp test_parser.hpp ${tests}) target_include_directories(cppast_test PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(cppast_test PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../src) target_link_libraries(cppast_test PUBLIC cppast) -target_compile_definitions(cppast_test PUBLIC CPPAST_INTEGRATION_FILE="${CMAKE_CURRENT_SOURCE_DIR}/integration.cpp") +target_compile_definitions(cppast_test PUBLIC CPPAST_INTEGRATION_FILE="${CMAKE_CURRENT_SOURCE_DIR}/integration.cpp" + CPPAST_COMPILE_COMMANDS="${CMAKE_BINARY_DIR}") set_target_properties(cppast_test PROPERTIES CXX_STANDARD 11) enable_testing() diff --git a/test/integration.cpp b/test/integration.cpp index ae7de3e..2f1efa1 100644 --- a/test/integration.cpp +++ b/test/integration.cpp @@ -123,7 +123,7 @@ TEST_CASE("cppast", "[!hide][integration]") cpp_entity_index idx; simple_file_parser parser(type_safe::ref(idx), default_logger()); - libclang_compilation_database database("../"); + libclang_compilation_database database(CPPAST_COMPILE_COMMANDS); libclang_compile_config config(database, CPPAST_INTEGRATION_FILE); config.fast_preprocessing(true); parse_files(parser, files, config);