From b2e699d28bf8aaad6180dd36f3fc4cfff1ca932b Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sun, 26 Nov 2017 20:31:54 +0100
Subject: Fix tests on Linux

---
 CMakeLists.txt                           | 4 +++-
 testfiles/CMakeLists.txt                 | 2 +-
 testfiles/rendering_tests/CMakeLists.txt | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35d443ef4..2f9fb9b43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,9 @@ add_custom_target(clean-all
 if(GMOCK_PRESENT)
     enable_testing()
     set(CMAKE_CTEST_COMMAND ctest -V)
-    set(CMAKE_CTEST_ENV INKSCAPE_DATADIR=${CMAKE_CURRENT_SOURCE_DIR}/share)
+    if(WIN32)
+        set(CMAKE_CTEST_ENV INKSCAPE_DATADIR=${CMAKE_CURRENT_SOURCE_DIR}/share)
+    endif()
     add_subdirectory(testfiles EXCLUDE_FROM_ALL)
     add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS tests)
     add_dependencies(check inkscape)
diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt
index 0ff2b28e0..d42e3fdee 100644
--- a/testfiles/CMakeLists.txt
+++ b/testfiles/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach(source ${TEST_SOURCES})
 	add_executable(${source} src/${source}.cpp unittest.cpp doc-per-case-test.cpp)
 	target_link_libraries(${source} ${TEST_LIBS})
 	add_test(NAME ${source} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source})
-    set_tests_properties(${source} PROPERTIES ENVIRONMENT ${CMAKE_CTEST_ENV})
+    set_tests_properties(${source} PROPERTIES ENVIRONMENT "${CMAKE_CTEST_ENV}")
 	add_dependencies(tests ${source})
 endforeach()
 add_subdirectory(rendering_tests)
diff --git a/testfiles/rendering_tests/CMakeLists.txt b/testfiles/rendering_tests/CMakeLists.txt
index 8db01d97a..ff067c3f5 100644
--- a/testfiles/rendering_tests/CMakeLists.txt
+++ b/testfiles/rendering_tests/CMakeLists.txt
@@ -11,6 +11,6 @@ set(RENDERING_TESTS
 
 foreach(rendering_test ${RENDERING_TESTS})
     add_test(NAME ${rendering_test} COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/inkscape ${CMAKE_CURRENT_SOURCE_DIR}/${rendering_test}  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/testfiles/rendering_tests )
-    set_tests_properties(${rendering_test} PROPERTIES ENVIRONMENT ${CMAKE_CTEST_ENV})
+    set_tests_properties(${rendering_test} PROPERTIES ENVIRONMENT "${CMAKE_CTEST_ENV}")
 endforeach()
 
-- 
cgit v1.2.3