Skip to content

Commit

Permalink
Change CMake build type from 'None' to 'EasyBuildRelease'
Browse files Browse the repository at this point in the history
  • Loading branch information
Balazs Hajgato committed Nov 9, 2018
1 parent 04616b2 commit ae38b01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/p/PSI4/PSI4-1.2.1-intel-2018b-Python-2.7.15.eb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sources = ['v%(version)s.tar.gz']
patches = ['PSI4-%(version)s_fix_cmake_release.patch']
checksums = [
'fbde7ee67174f7ba7b7f6f4e8117ce8b80f5fd10414577f5b0fcdbaa6c8ba020', # v1.2.1.tar.gz
'5c1027114dc1505c90c087af09c1c4cfbff5210de7fb7f9ae6a8fe60e917d614', # PSI4-1.2.1_fix_cmake_release.patch
'38e964973d2f0797f28a9a09165ae67fc1dba454e44e5e40e9d3f06a22092efb', # PSI4-1.2.1_fix_cmake_release.patch
]

dependencies = [
Expand Down
14 changes: 7 additions & 7 deletions easybuild/easyconfigs/p/PSI4/PSI4-1.2.1_fix_cmake_release.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# remove CMAKE_BUILD_TYPE check (beacuse it is set to None to avoid -O3 optimization flag)
# remove CMAKE_BUILD_TYPE check (beacuse it is set to EasyBuildRelease to avoid -O3 optimization flag)
# November 02nd 2018 by B. Hajgato - (Free University Brussels - VUB)
diff --new-file -ru psi4-1.2.1.orig/cmake/autocmake_safeguards.cmake psi4-1.2.1/cmake/autocmake_safeguards.cmake
--- psi4-1.2.1.orig/cmake/autocmake_safeguards.cmake 2018-07-25 04:11:25.000000000 +0200
Expand All @@ -24,7 +24,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/gau2grid/CMakeLists.txt ps
GIT_REPOSITORY https://github.com/dgasmith/gau2grid
GIT_TAG v1.1.0
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand All @@ -35,7 +35,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/libint/CMakeLists.txt psi4
GIT_REPOSITORY https://github.com/evaleev/libint
GIT_TAG 024738c # v1.2.1+2 release-1-2-1
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand All @@ -45,7 +45,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/libint/CMakeLists.txt psi4
GIT_REPOSITORY https://github.com/psi4/dkh
GIT_TAG v1.2
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand All @@ -55,7 +55,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/libint/CMakeLists.txt psi4
GIT_REPOSITORY https://github.com/ilyak/libefp
GIT_TAG 15cd7ce # v1.5.0 + 10 (docs and a cmake lapack patch)
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand All @@ -65,7 +65,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/libint/CMakeLists.txt psi4
GIT_REPOSITORY https://github.com/psi4/gdma
GIT_TAG 9d607d7 # v2.2.6-2-g9d607d7
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
Expand All @@ -75,7 +75,7 @@ diff --new-file -ru psi4-1.2.1.orig/external/upstream/libint/CMakeLists.txt psi4
GIT_REPOSITORY https://github.com/psi4/libxc
GIT_TAG libxc4retweaked # v4.0 (0387b1d1) + !62 + MVS corr + 4.0.2 bump + 2 build commits = c754e28
UPDATE_COMMAND ""
+ PATCH_COMMAND sed -e "s/debug/none/" -i cmake/autocmake_safeguards.cmake
+ PATCH_COMMAND sed -e "s/debug/easybuildrelease/" -i cmake/autocmake_safeguards.cmake
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

0 comments on commit ae38b01

Please sign in to comment.