Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Sep 27, 2021. It is now read-only.

cmake: move clean up to cmake #550

Merged
merged 3 commits into from
Jun 16, 2020
Merged

cmake: move clean up to cmake #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16fd46a
cmake: move clean up to cmake
junghans Jun 15, 2020
f0babcb
update changelog
junghans Jun 15, 2020
6ed584c
.gitlab-ci.yml: disable lmp on openSUSE
junghans Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ stages:
-DMODULE_BUILD=${MODULE_BUILD} ${MODULE_BUILD:+-DCMAKE_INSTALL_PREFIX=/home/votca/votca.install}
${MINIMAL:+-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=ON
-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON -DBUILD_MANPAGES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_GROMACS=ON -DBUILD_XTP=OFF -DENABLE_REGRESSION_TESTING=OFF}
${EXTRA_CMAKE_ARGS}
- cmake --build . --parallel 2
- ctest --output-on-failure
- test -z "${MODULE_BUILD}" && DESTDIR=${PWD}/install cmake --install . && rm -rf ${PWD}/install/usr && rmdir ${PWD}/install
Expand Down Expand Up @@ -228,6 +229,7 @@ Debug GCC openSUSE:
CXX: "g++"
CMAKE_BUILD_TYPE: "Debug"
DISTRO: "opensuse"
EXTRA_CMAKE_ARGS: "-DCMAKE_DISABLE_FIND_PACKAGE_LMP=ON"
extends: .build

Debug Clang openSUSE:
Expand All @@ -237,6 +239,7 @@ Debug Clang openSUSE:
CMAKE_BUILD_TYPE: "Debug"
CMAKE_GENERATOR: "Ninja"
DISTRO: "opensuse"
EXTRA_CMAKE_ARGS: "-DCMAKE_DISABLE_FIND_PACKAGE_LMP=ON"
extends: .build

Release GCC openSUSE:
Expand All @@ -245,6 +248,7 @@ Release GCC openSUSE:
CXX: "g++"
CMAKE_BUILD_TYPE: "Release"
DISTRO: "opensuse"
EXTRA_CMAKE_ARGS: "-DCMAKE_DISABLE_FIND_PACKAGE_LMP=ON"
extends: .build

Release Clang openSUSE:
Expand All @@ -254,6 +258,7 @@ Release Clang openSUSE:
CMAKE_BUILD_TYPE: "Release"
CMAKE_GENERATOR: "Ninja"
DISTRO: "opensuse"
EXTRA_CMAKE_ARGS: "-DCMAKE_DISABLE_FIND_PACKAGE_LMP=ON"
extends: .build

Debug GCC Rawhide:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ For more detailed information about the changes see the history of the
* document cmake options and packages (#520)
* drop WITH_GMX in cmake in favor of auto-detect (#523)
* standardising include order and style in header files (#531)
* make scripts always executable in builddir (#533)
* make scripts always executable in builddir (#533, #550)
* rename REGRESSIONTEST_TOLERANCE to INTEGRATIONTEST_TOLERANCE (#534)
* standardising include order and style in library files (#542)

Expand Down
2 changes: 0 additions & 2 deletions CMakeModules/gitscript.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ string(REGEX REPLACE "#CSG_GIT_ID#" "${THIS_GIT_ID}" NEW_CONTENT "${CONTENT}")
file(WRITE "${OUTPUT}.tmp" "${NEW_CONTENT}")
file(COPY "${OUTPUT}.tmp" DESTINATION "${OUTPUT}.tmp.x" FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OUTPUT}.tmp.x/${OUTPUT}.tmp ${OUTPUT})
execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${OUTPUT}.tmp ${OUTPUT}.tmp.x/${OUTPUT}.tmp)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${OUTPUT}.tmp.x)
2 changes: 1 addition & 1 deletion scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ foreach(SCRIPT csg_call csg_inverse)
-DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
-DTOP_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -P ${PROJECT_SOURCE_DIR}/CMakeModules/gitscript.cmake
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT}.tmp.out ${PROJECT_SOURCE_DIR}/CMakeModules/gitscript.cmake)
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${SCRIPT})
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${SCRIPT} ${SCRIPT}.tmp ${SCRIPT}.tmp.x)
set_property(TARGET votca_csg APPEND PROPERTY BINARIES "${SCRIPT}")
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT} DESTINATION ${CMAKE_INSTALL_BINDIR})
if (TXT2TAGS_FOUND AND BASH)
Expand Down