1
0

Use same binary for restart and normal run

This commit is contained in:
Jip J. Dekker 2021-06-15 17:29:34 +10:00
parent 7c82ed140c
commit 13baf4eeb4
No known key found for this signature in database
GPG Key ID: 517DF4A00618C9C3
6 changed files with 4 additions and 14 deletions

10
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "software/gecode_on_restart"]
path = software/gecode_on_restart
url = git@github.com:Dekker1/gecode.git
branch = feature/on_restart
[submodule "software/gecode_on_record"]
path = software/gecode_on_record
url = git@github.com:Dekker1/gecode.git
@ -13,12 +9,8 @@
[submodule "software/gecode"]
path = software/gecode
url = git@github.com:Dekker1/gecode.git
branch = develop
branch = feature/on_restart
[submodule "software/chuffed"]
path = software/chuffed
url = git@github.com:Dekker1/chuffed.git
branch = develop
[submodule "software/chuffed_on_restart"]
path = software/chuffed_on_restart
url = git@github.com:Dekker1/chuffed.git
branch = feature/on_restart

View File

@ -8,7 +8,7 @@ module load flex
mkdir -p software/{build,install}
# Build Chuffed
for dir in "chuffed" "chuffed_on_restart" "gecode" "gecode_on_record" "gecode_on_replay" "gecode_on_restart"
for dir in "chuffed" "gecode" "gecode_on_record" "gecode_on_replay"
do
cmake -S software/${dir} -B software/build/${dir} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=`pwd`/software/install/${dir}
cmake --build software/build/${dir} --config Release --target install

@ -1 +1 @@
Subproject commit e04bedd06c3eee88f318372a8a1ed35c954ba9d4
Subproject commit 4b88dae8a6c50f327e876ddcccde5bda0b01c4dc

@ -1 +0,0 @@
Subproject commit 4b88dae8a6c50f327e876ddcccde5bda0b01c4dc

@ -1 +1 @@
Subproject commit bbefcea214fec798a0f5acc442581984555acd21
Subproject commit 313e87646da4fc2752a70e83df16d993121a8e40

@ -1 +0,0 @@
Subproject commit 313e87646da4fc2752a70e83df16d993121a8e40