From a44f2e9e7b2dbcdf51564453475ec9a684cf7f75 Mon Sep 17 00:00:00 2001
From: Vicent Marti <tanoku@gmail.com>
Date: Wed, 2 Jan 2013 22:26:34 +0100
Subject: [PATCH] Try it like this...

---
 .travis.yml    |  6 ++++--
 CMakeLists.txt | 12 +++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 507248a99..8ce490356 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 # Travis-CI Build for libgit2
 # see travis-ci.org for details
+
+# As CMake is not officially supported we use erlang VMs
 language: c
 
 compiler:
@@ -26,8 +28,8 @@ script:
  - mkdir _build
  - cd _build
  - cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS
- - make submodules all
- - ./libgit2_clar
+ - cmake --build . --target install
+ - ctest -V .
 
 # Run Tests
 after_script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43b405d4b..2f5c559e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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(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
 IF (BUILD_CLAR)
 	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(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(
 		OUTPUT ${CLAR_PATH}/clar.suite
 		COMMAND ${PYTHON_EXECUTABLE} clar/generate.py .