From ef21871e300908533fd0b96d244463553418ef6a Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Tue, 3 Jan 2017 10:48:45 +0100 Subject: [PATCH] Properly set test media files path, fixes #36 This overrides TEST_MEDIA_PATH so that it is no longer set to "../../src/examples/" --- tests/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 431987b4..2c455503 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,16 +24,19 @@ # along with OpenShot Library. If not, see . ################################################################################ +SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/") ################ WINDOWS ################## # Set some compiler options for Windows # required for libopenshot-audio headers IF (WIN32) - STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/") - add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) + STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH) + add_definitions( -DIGNORE_JUCE_HYPOT=1 ) SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath") ENDIF(WIN32) +add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) + ################### UNITTEST++ ##################### # Find UnitTest++ libraries (used for unit testing) FIND_PACKAGE(UnitTest++ REQUIRED) @@ -184,4 +187,4 @@ IF (NOT DISABLE_TESTS) #################### MAKE TEST ###################### # Hook up the 'make test' target to the 'openshot-test' executable ADD_CUSTOM_TARGET(test ${CMAKE_CURRENT_BINARY_DIR}/openshot-test) -ENDIF (NOT DISABLE_TESTS) \ No newline at end of file +ENDIF (NOT DISABLE_TESTS)