diff --git a/.gitmodules b/.gitmodules index 678c8db..30d0d23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,7 @@ path = software/chuffed url = git@github.com:Dekker1/chuffed.git branch = feature/on_restart +[submodule "software/minizinc"] + path = software/minizinc + url = git@github.com:Dekker1/libminizinc.git + branch = feature/on_restart diff --git a/install.sh b/install.sh index 067acea..30b9e5b 100755 --- a/install.sh +++ b/install.sh @@ -8,7 +8,7 @@ module load flex mkdir -p software/{build,install} # Build Chuffed -for dir in "chuffed" "gecode" "gecode_on_record" "gecode_on_replay" +for dir in "chuffed" "gecode" "gecode_on_record" "gecode_on_replay" "minizinc" 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 -- -j4 diff --git a/setup.sh b/setup.sh index eb79468..6d095c3 100644 --- a/setup.sh +++ b/setup.sh @@ -4,4 +4,4 @@ timeout_sec=120 record_timeout_sec=240 runs=10 -module load MiniZinc/2.5.5 +export PATH=`pwd`/software/install/minizinc/bin:$PATH diff --git a/software/minizinc b/software/minizinc new file mode 160000 index 0000000..4f10c82 --- /dev/null +++ b/software/minizinc @@ -0,0 +1 @@ +Subproject commit 4f10c82056ffcb1041d7ffef29d77a7eef92cf76