Skip to content

Commit

Permalink
Merge pull request #1550 from karlnapf/develop
Browse files Browse the repository at this point in the history
remove jinj2 requirement for unit tests and add comment in readme about custom python
  • Loading branch information
karlnapf committed Sep 7, 2013
2 parents 1e216c0 + 6471e5b commit 297fb51
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ OPTION(ENABLE_TESTING "Enable testing" OFF)
OPTION(TRAVIS_DISABLE_UNIT_TESTS "Disable unit testing to speed up jobs on travis-ci" OFF)
OPTION(TRAVIS_DISABLE_LIBSHOGUN_TESTS "Disable libshogun tests to speed up jobs on travis-ci" OFF)
IF(ENABLE_TESTING)
FIND_PACKAGE(Jinja2 REQUIRED)
FIND_PACKAGE(Jinja2)
IF(NOT BUILD_DASHBOARD_REPORTS)
enable_testing()
ENDIF()
Expand Down
3 changes: 3 additions & 0 deletions README.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ cd tests/unit && valgrind --leak-check=full ./shogun-unit-test --gtest_filter=EP
# specify a different compiler (from CMake FAQ http://www.cmake.org/Wiki/CMake_FAQ "How do I use a different compiler?")
# You might have to delete the build directory or clear the cmake cache otherwise for this to work
CC=/path/to/gcc CXX=/path/to/g++ cmake ..

# use a custom python installation for python bindings (here 2.7.1 installed in path/to/python
cmake -DPYTHON_INCLUDE_DIR=/path/to/python/include/python2.7 -DPYTHON_LIBRARY=path/to/python/python-2.7.1/lib/python2.7 ..

0 comments on commit 297fb51

Please sign in to comment.