From b15cf355af367cd94493b139c9de8eaaee773758 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 12 Dec 2014 18:42:15 +0300 Subject: [PATCH] remove opencv_testing.sh installation to /etc/profile.d/ opencv_run_all_tests_unix.sh already exports OPENCV_TEST_DATA_PATH --- CMakeLists.txt | 4 ---- cmake/templates/opencv_testing.sh.in | 2 -- 2 files changed, 6 deletions(-) delete mode 100644 cmake/templates/opencv_testing.sh.in diff --git a/CMakeLists.txt b/CMakeLists.txt index efe56c1..68555d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -598,10 +598,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH AND UNIX) install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT tests) else() - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_testing.sh.in" - "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh" @ONLY) - install(FILES "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh" - DESTINATION /etc/profile.d/ COMPONENT tests) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_run_all_tests_unix.sh.in" "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" @ONLY) install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" diff --git a/cmake/templates/opencv_testing.sh.in b/cmake/templates/opencv_testing.sh.in deleted file mode 100644 index 3140136..0000000 --- a/cmake/templates/opencv_testing.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -# Environment setup for OpenCV testing -export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata \ No newline at end of file -- 2.7.4