diff --git a/CMakeLists.txt b/CMakeLists.txt index dd86b11fb6caae6db8d40e57dfa3e0678d9e7a99..26a332c93a6f7959b4e3732ba9babad97a89cafe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -474,7 +474,6 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX) install(DIRECTORY ui5/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}) endif() install(DIRECTORY man/ DESTINATION ${CMAKE_INSTALL_MANDIR}) - install(DIRECTORY test/ DESTINATION ${CMAKE_INSTALL_TESTDIR} COMPONENT tests) install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests) install(DIRECTORY cmake/modules DESTINATION ${CMAKE_INSTALL_CMAKEDIR} PATTERN "Find*.cmake" EXCLUDE) endif() diff --git a/README/INSTALL b/README/INSTALL index 9bd1a70cabe3c599972aa087753c055953975872..3074ca9fad8f585de32b56aad5f37f5a39f44c6f 100644 --- a/README/INSTALL +++ b/README/INSTALL @@ -209,8 +209,6 @@ Here's the complete list: * docdir (<prefix>/doc/root) Documentation, like the LICENCE, README, etc. files will be installed into this directory. -* testdir (<docdir>/test) - The test applications and libraries will be installed here. * tutdir (<docdir>/tutorial) All the tutorials will be installed in this directory. diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake index 2c88135629129f97d4086825fa398235dd113349..a6c74fd3824fae754633216380c9bc1e9d9e07aa 100644 --- a/cmake/modules/RootConfiguration.cmake +++ b/cmake/modules/RootConfiguration.cmake @@ -115,11 +115,6 @@ if(IS_ABSOLUTE ${CMAKE_INSTALL_DOCDIR}) else() set(docdir ${prefix}/${CMAKE_INSTALL_DOCDIR}) endif() -if(IS_ABSOLUTE ${CMAKE_INSTALL_TESTDIR}) - set(testdir ${CMAKE_INSTALL_TESTDIR}) -else() - set(testdir ${prefix}/${CMAKE_INSTALL_TESTDIR}) -endif() if(IS_ABSOLUTE ${CMAKE_INSTALL_TUTDIR}) set(tutdir ${CMAKE_INSTALL_TUTDIR}) else() diff --git a/cmake/modules/RootInstallDirs.cmake b/cmake/modules/RootInstallDirs.cmake index 1031e6571ac2ac4a1690871f173aaf116239ea4a..a99b0d48148baf8e9c00ecb132548fe89329fc53 100644 --- a/cmake/modules/RootInstallDirs.cmake +++ b/cmake/modules/RootInstallDirs.cmake @@ -18,7 +18,6 @@ # SRCDIR - sources (DATAROOTDIR/src) # FONTDIR - fonts (DATAROOTDIR/fonts) # DOCDIR - documentation root (DATAROOTDIR/doc/PROJECT_NAME) -# TESTDIR - tests (DOCDIR/test) # TUTDIR - tutorials (DOCDIR/tutorials) # ACLOCALDIR - locale-dependent data (DATAROOTDIR/aclocal) # CMAKEDIR - cmake modules (DATAROOTDIR/cmake) @@ -204,15 +203,6 @@ if(NOT CMAKE_INSTALL_DOCDIR) endif() endif() -if(NOT CMAKE_INSTALL_TESTDIR) - set(CMAKE_INSTALL_TESTDIR "" CACHE PATH "root tests (DOCDIR/test)") - if(gnuinstall) - set(CMAKE_INSTALL_TESTDIR "${CMAKE_INSTALL_DOCDIR}/test") - else() - set(CMAKE_INSTALL_TESTDIR "test") - endif() -endif() - if(NOT CMAKE_INSTALL_TUTDIR) set(CMAKE_INSTALL_TUTDIR "" CACHE PATH "root tutorials (DOCDIR/tutorials)") if(gnuinstall) @@ -239,7 +229,6 @@ mark_as_advanced( CMAKE_INSTALL_FONTDIR CMAKE_INSTALL_SRCDIR CMAKE_INSTALL_DOCDIR - CMAKE_INSTALL_TESTDIR CMAKE_INSTALL_TUTDIR CMAKE_INSTALL_ACLOCALDIR CMAKE_INSTALL_ELISPDIR @@ -261,7 +250,6 @@ foreach(dir BINDIR FONTDIR SRCDIR DOCDIR - TESTDIR TUTDIR ACLOCALDIR ELISPDIR diff --git a/config/Makefile.in b/config/Makefile.in index 0b8a83bb0c779947b9ad8066ad00cfbd2a45ec1b..d8b581cf929d2f853e1bd616cb697efcf3dba6a8 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -89,7 +89,6 @@ MACRODIR := @macrodir@ SRCDIR := @srcdir@ ICONPATH := @iconpath@ DOCDIR := @docdir@ -TESTDIR := @testdir@ TUTDIR := @tutdir@ ACLOCALDIR := @aclocaldir@