[!12] Remove patch for executable scripts - it is in dune-common now

Merge branch 'feature/dune-testtools' into 'master'

See merge request [spack/dune-spack!12]

  [spack/dune-spack!12]: Nonespack/dune-spack/merge_requests/12
This commit is contained in:
Dominic Kempf 2020-05-18 10:01:27 +00:00
commit b367fafaf5
2 changed files with 0 additions and 29 deletions

View File

@ -1,28 +0,0 @@
diff --git a/cmake/scripts/CMakeLists.txt b/cmake/scripts/CMakeLists.txt
index a59060b8..0d8587f3 100644
--- a/cmake/scripts/CMakeLists.txt
+++ b/cmake/scripts/CMakeLists.txt
@@ -1,15 +1,21 @@
+# Install non-executable scripts
install(FILES
conf.py.in
CreateDoxyFile.cmake
envdetect.py
- extract_cmake_data.py
FinalizeHeadercheck.cmake
index.rst.in
InstallFile.cmake
main77.cc.in
module_library.cc.in
pyversion.py
- run-in-dune-env.sh.in
RunDoxygen.cmake
sphinx_cmake_dune.py
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts)
+
+# Install executable programs
+install(PROGRAMS
+ extract_cmake_data.py
+ run-in-dune-env.sh.in
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts
+)

View File

@ -207,7 +207,6 @@ class Dune(CMakePackage):
depends_on('zoltan', when='+zoltan')
# Apply patches
patch('executable_scripts.patch')
patch('virtualenv_from_envvariable.patch', when='+testtools')
def setup_build_environment(self, env):