diff options
| author | Gereon Kremer <gereon.kremer@cs.rwth-aachen.de> | 2021-04-02 18:32:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 09:32:36 -0700 |
| commit | ed1e21df4c7364e9d78f1a5c0605c45640d9ccca (patch) | |
| tree | 52ef6ae898764f4dc5386252d50a268c9357d410 /cmake | |
| parent | 2d46c5c3921e027fb67fee66c3c9e62ead61438c (diff) | |
FindCaDiCaL: Avoid redirect to file (#6272)
This PR avoids output redirection by replacing sed + redirect with copy + in-place sed.
Using output redirects can cause problems if the cmake output itself is redirected as well.
This should fix the current nightly failure.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindCaDiCaL.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake index c8490b8ca..40a048faa 100644 --- a/cmake/FindCaDiCaL.cmake +++ b/cmake/FindCaDiCaL.cmake @@ -61,9 +61,12 @@ if(NOT CaDiCaL_FOUND_SYSTEM) URL_HASH SHA1=9de1176737b74440921ba86395fe5edbb3b131eb CONFIGURE_COMMAND mkdir -p <SOURCE_DIR>/build # avoid configure script, prepare the makefile manually + COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/makefile.in + <SOURCE_DIR>/build/makefile COMMAND - sed -e "s,@CXX@,${CMAKE_CXX_COMPILER}," -e "s,@CXXFLAGS@,${CXXFLAGS}," -e - "s,@MAKEFLAGS@,," <SOURCE_DIR>/makefile.in > <SOURCE_DIR>/build/makefile + sed -i.orig -e "s,@CXX@,${CMAKE_CXX_COMPILER}," -e + "s,@CXXFLAGS@,${CXXFLAGS}," -e "s,@MAKEFLAGS@,," + <SOURCE_DIR>/build/makefile # use $(MAKE) instead of "make" to allow for parallel builds BUILD_COMMAND $(MAKE) -C <SOURCE_DIR>/build libcadical.a INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/build/libcadical.a |