Try it like this...

This commit is contained in:
Vicent Marti 2013-01-02 22:26:34 +01:00
parent e229c04825
commit a44f2e9e7b
2 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,7 @@
# Travis-CI Build for libgit2 # Travis-CI Build for libgit2
# see travis-ci.org for details # see travis-ci.org for details
# As CMake is not officially supported we use erlang VMs
language: c language: c
compiler: compiler:
@ -26,8 +28,8 @@ script:
- mkdir _build - mkdir _build
- cd _build - cd _build
- cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS - cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS
- make submodules all - cmake --build . --target install
- ./libgit2_clar - ctest -V .
# Run Tests # Run Tests
after_script: after_script:

View File

@ -231,13 +231,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc DESTINATION ${LIB_INSTALL_D
INSTALL(DIRECTORY include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} ) INSTALL(DIRECTORY include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} )
INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} ) INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} )
ADD_CUSTOM_TARGET(
submodules
COMMAND git submodule update --init tests-clar/clar
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
# Tests # Tests
IF (BUILD_CLAR) IF (BUILD_CLAR)
FIND_PACKAGE(PythonInterp REQUIRED) FIND_PACKAGE(PythonInterp REQUIRED)
@ -253,6 +246,11 @@ IF (BUILD_CLAR)
SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_helpers.c" "${CLAR_PATH}/clar/clar.c") SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_helpers.c" "${CLAR_PATH}/clar/clar.c")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes")
ADD_CUSTOM_COMMAND(
OUTPUT ${CLAR_PATH}/clar/clar.c
COMMAND git submodule update --init tests-clar/clar
)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CLAR_PATH}/clar.suite OUTPUT ${CLAR_PATH}/clar.suite
COMMAND ${PYTHON_EXECUTABLE} clar/generate.py . COMMAND ${PYTHON_EXECUTABLE} clar/generate.py .