Merge pull request #235 from crocs-muni/dev

Dev
crocs-muni · Apr 21, 2017 · 465ec8a · 465ec8a
2 parents 875498f + ad2ccda
commit 465ec8a
Show file tree

Hide file tree

Showing 2,075 changed files with 267 additions and 410,087 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "eacirc-streams"]
+	path = eacirc-streams
+	url = https://github.com/crocs-muni/eacirc-streams.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,18 @@
 cmake_minimum_required(VERSION 3.4)
 project(eacirc)
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+find_package(Git)
+
+if (NOT EXISTS eacirc-streams/CMakeLists.txt)
+    execute_process(
+            COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/eacirc-streams/eacirc-core/cmake)
+
+include(build_stream)
 
 # === Set CXX flags ===
 if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
@@ -14,19 +25,13 @@ else()
 endif()
 
 # === targets ===
-add_subdirectory(core)
+add_subdirectory(eacirc-streams)
+
 add_subdirectory(eacirc)
 add_subdirectory(solvers)
 
-add_subdirectory(streams/estream)
-add_subdirectory(streams/sha3)
-add_subdirectory(streams/block)
-
-add_subdirectory(external/json)
-add_subdirectory(external/pcg-cpp-0.98)
-
 add_custom_target(config SOURCES
-    .travis.yml
-    appveyor.yml
-    config.json
-    )
+        .travis.yml
+        appveyor.yml
+        config.json
+        )
diff --git a/cmake/build_stream.cmake b/cmake/build_stream.cmake
diff --git a/cmake/detect_version.cmake b/cmake/detect_version.cmake
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
diff --git a/core/builtins.h b/core/builtins.h
diff --git a/core/cmd.h b/core/cmd.h
diff --git a/core/dataset.h b/core/dataset.h
diff --git a/core/debug.h b/core/debug.h