Skip to content

Commit 465ec8a

Browse files
authored
Merge pull request #235 from crocs-muni/dev
Dev
2 parents 875498f + ad2ccda commit 465ec8a

2,075 files changed

Lines changed: 267 additions & 410087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "eacirc-streams"]
2+
path = eacirc-streams
3+
url = https://github.com/crocs-muni/eacirc-streams.git

CMakeLists.txt

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
cmake_minimum_required(VERSION 3.4)
22
project(eacirc)
33

4-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
4+
find_package(Git)
5+
6+
if (NOT EXISTS eacirc-streams/CMakeLists.txt)
7+
execute_process(
8+
COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
9+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
10+
)
11+
endif()
12+
13+
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/eacirc-streams/eacirc-core/cmake)
14+
15+
include(build_stream)
516

617
# === Set CXX flags ===
718
if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
@@ -14,19 +25,13 @@ else()
1425
endif()
1526

1627
# === targets ===
17-
add_subdirectory(core)
28+
add_subdirectory(eacirc-streams)
29+
1830
add_subdirectory(eacirc)
1931
add_subdirectory(solvers)
2032

21-
add_subdirectory(streams/estream)
22-
add_subdirectory(streams/sha3)
23-
add_subdirectory(streams/block)
24-
25-
add_subdirectory(external/json)
26-
add_subdirectory(external/pcg-cpp-0.98)
27-
2833
add_custom_target(config SOURCES
29-
.travis.yml
30-
appveyor.yml
31-
config.json
32-
)
34+
.travis.yml
35+
appveyor.yml
36+
config.json
37+
)

cmake/build_stream.cmake

Lines changed: 0 additions & 10 deletions
This file was deleted.

cmake/detect_version.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

core/CMakeLists.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.

core/builtins.h

Lines changed: 0 additions & 85 deletions
This file was deleted.

core/cmd.h

Lines changed: 0 additions & 88 deletions
This file was deleted.

core/dataset.h

Lines changed: 0 additions & 47 deletions
This file was deleted.

core/debug.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)