Merge pull request #51 from dabaez/default_struction

Compiles struction by default

Author: schulzchristian

compile_withcmake.sh

@@ -26,7 +26,9 @@ cd ..
 
 mkdir deploy
 cp ./mmwis/deploy/mmwis deploy/
-cp ./mmwis/deploy/struction deploy/
+if [ -f ./mmwis/deploy/struction ]; then
+        cp ./mmwis/deploy/struction deploy/
+fi
 cp ./build/redumis deploy/
 cp ./build/graphchecker deploy/
 cp ./build/sort_adjacencies deploy/

mmwis/CMakeLists.txt

@@ -141,8 +141,12 @@ target_include_directories(lib_mmwis PRIVATE ${MMWIS_INCLUDES})
 
 add_dependencies(lib_mmwis libkaffpa)
 
-option(STRUCTION_ENABLE_APPS "enable/disable struction executables")
-add_subdirectory(extern/struction EXCLUDE_FROM_ALL)
+option(STRUCTION_ENABLE_APPS "enable/disable struction executables" ON)
+if(STRUCTION_ENABLE_APPS)
+    add_subdirectory(extern/struction)
+else()
+    add_subdirectory(extern/struction EXCLUDE_FROM_ALL)
+endif()
 
 add_executable(mmwis "app/mmwis.cpp" $<TARGET_OBJECTS:libkaffpa> 
                                      $<TARGET_OBJECTS:libmapping> 

mmwis/compile.sh

@@ -19,7 +19,7 @@ fi
 # compile mmwis and hils
 
 rm -rf deploy
-# rm -rf build
+rm -rf build
 mkdir build
 cd build
 cmake ../ -DCMAKE_C_COMPILER=$(which gcc) -DCMAKE_CXX_COMPILER=$(which g++) -DCMAKE_BUILD_TYPE=${buildtype}
@@ -28,7 +28,9 @@ cd ..
 
 mkdir deploy
 cp ./build/mmwis                                                         deploy/mmwis
-cp ./build/extern/struction/branch_reduce_convergence                    deploy/struction
-# rm -rf build
+if [ -f ./build/extern/struction/branch_reduce_convergence ]; then
+        cp ./build/extern/struction/branch_reduce_convergence                    deploy/struction
+fi
+rm -rf build