Update install info and test resource path handling
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61498a6..2ef6bfb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
# CMake build script for the libgit2 project
-# Peter Drahos 2010
#
-# Building:
+# Building (out of source build):
# > mkdir build && cd build
-# > cmake .. && make -j3
+# > cmake .. [-DSETTINGS=VALUE]
+# > cmake --build .
#
# Testing:
# > ctest -V
#
# Install:
-# > make install
+# > cmake --build . --target install
PROJECT(libgit2 C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
@@ -87,6 +87,9 @@ INSTALL(FILES src/git2.h DESTINATION ${INSTALL_INC} )
# Tests
IF (BUILD_TESTS)
+ SET(TEST_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" CACHE PATH "Path to test resources.")
+ ADD_DEFINITIONS(-DTEST_RESOURCES=\"${TEST_RESOURCES}\")
+
ENABLE_TESTING()
# Find and build all tests
INCLUDE_DIRECTORIES(tests)
diff --git a/README.md b/README.md
index 820e928..11f0ef4 100644
--- a/README.md
+++ b/README.md
@@ -50,14 +50,21 @@ Optional dependency:
* LibSSL <http://www.openssl.org/>
-On most Unix systems you can build the library using the following commands
+On most systems you can build the library using the following commands
$ mkdir build && cd build
$ cmake ..
- $ make install
+ $ cmake --build .
Alternatively you can point the CMake GUI tool to the CMakeLists.txt file and generate platform specific build project or IDE workspace.
+To install the library you can specify the install prefix by setting:
+
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/install/prefix
+ $ cmake --build . --target install
+
+For more advanced use or questions about CMake please read <http://www.cmake.org/Wiki/CMake_FAQ>.
+
Building libgit2 - Unix systems
==================================