Merge branch 'master' into develop

This commit is contained in:
Daniel Chappuis 2015-07-12 12:11:43 +02:00
commit 3aa60e60bf
2 changed files with 4 additions and 0 deletions

View File

@ -15,6 +15,8 @@ SET(LIBRARY_OUTPUT_PATH "lib")
# Where to build the executables
SET(OUR_EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
ENABLE_TESTING()
# Options
OPTION(COMPILE_EXAMPLES "Select this if you want to build the examples" OFF)
OPTION(COMPILE_TESTS "Select this if you want to build the tests" OFF)

View File

@ -18,3 +18,5 @@ file (
ADD_EXECUTABLE(tests ${TESTS_SOURCE_FILES})
TARGET_LINK_LIBRARIES(tests reactphysics3d)
ADD_TEST(Test tests)