Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
6475f47e
Commit
6475f47e
authored
Sep 10, 2014
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace libcaf_{probe|probe_event} with riac lib
parent
d9d35de3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
54 deletions
+42
-54
.gitmodules
.gitmodules
+3
-6
CMakeLists.txt
CMakeLists.txt
+38
-46
libcaf_probe
libcaf_probe
+0
-1
libcaf_probe_event
libcaf_probe_event
+0
-1
libcaf_riac
libcaf_riac
+1
-0
No files found.
.gitmodules
View file @
6475f47e
[submodule "benchmarks"]
[submodule "benchmarks"]
path = benchmarks
path = benchmarks
url = https://github.com/actor-framework/benchmarks.git
url = https://github.com/actor-framework/benchmarks.git
[submodule "probe-event"]
path = libcaf_probe_event
url = https://github.com/actor-framework/probe-event.git
[submodule "nexus"]
[submodule "nexus"]
path = nexus
path = nexus
url = https://github.com/actor-framework/nexus.git
url = https://github.com/actor-framework/nexus.git
[submodule "probe"]
path = libcaf_probe
url = https://github.com/actor-framework/probe.git
[submodule "shell"]
[submodule "shell"]
path = shell
path = shell
url = https://github.com/actor-framework/shell
url = https://github.com/actor-framework/shell
[submodule "opencl"]
[submodule "opencl"]
path = libcaf_opencl
path = libcaf_opencl
url = https://github.com/actor-framework/opencl.git
url = https://github.com/actor-framework/opencl.git
[submodule "libcaf_riac"]
path = libcaf_riac
url = git@github.com:actor-framework/riac.git
CMakeLists.txt
View file @
6475f47e
...
@@ -12,8 +12,8 @@ endif()
...
@@ -12,8 +12,8 @@ endif()
if
(
NOT CAF_NO_MEM_MANAGEMENT
)
if
(
NOT CAF_NO_MEM_MANAGEMENT
)
set
(
CAF_NO_MEM_MANAGEMENT no
)
set
(
CAF_NO_MEM_MANAGEMENT no
)
endif
()
endif
()
if
(
NOT CAF_HAS_
PROBE_EVENTS
)
if
(
NOT CAF_HAS_
RIAC
)
set
(
CAF_HAS_
PROBE_EVENTS
no
)
set
(
CAF_HAS_
RIAC
no
)
endif
()
endif
()
if
(
NOT CAF_BUILD_STATIC_ONLY
)
if
(
NOT CAF_BUILD_STATIC_ONLY
)
set
(
CAF_BUILD_STATIC_ONLY no
)
set
(
CAF_BUILD_STATIC_ONLY no
)
...
@@ -208,17 +208,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf)
...
@@ -208,17 +208,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf)
set
(
LIBCAF_INCLUDE_DIRS
set
(
LIBCAF_INCLUDE_DIRS
${
CMAKE_SOURCE_DIR
}
/libcaf_opencl/
${
LIBCAF_INCLUDE_DIRS
}
)
${
CMAKE_SOURCE_DIR
}
/libcaf_opencl/
${
LIBCAF_INCLUDE_DIRS
}
)
endif
()
endif
()
# path to probe-event headers (if submodule is loaded)
if
(
EXISTS
"
${
CMAKE_SOURCE_DIR
}
/libcaf_probe_event/caf"
)
set
(
LIBCAF_INCLUDE_DIRS
${
CMAKE_SOURCE_DIR
}
/libcaf_probe_event/
${
LIBCAF_INCLUDE_DIRS
}
)
# make files from probe-event show up in IDE
file
(
GLOB PROBE_EVENTS_HDRS
"
${
CMAKE_SOURCE_DIR
}
/libcaf_probe_event/caf/probe_event/*.hpp"
)
add_custom_target
(
caf_probe_events_dummy SOURCES
${
PROBE_EVENTS_HDRS
}
)
set
(
CAF_HAS_PROBE_EVENTS yes
)
endif
()
# all projects need the headers of the core components
# all projects need the headers of the core components
include_directories
(
${
LIBCAF_INCLUDE_DIRS
}
)
include_directories
(
${
LIBCAF_INCLUDE_DIRS
}
)
...
@@ -272,15 +261,38 @@ if(NOT CAF_NO_EXAMPLES)
...
@@ -272,15 +261,38 @@ if(NOT CAF_NO_EXAMPLES)
add_dependencies
(
opencl_examples libcaf_opencl
)
add_dependencies
(
opencl_examples libcaf_opencl
)
endif
()
endif
()
endif
()
endif
()
# build RIAC if not being told otherwise
if
(
NOT CAF_NO_RIAC AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/libcaf_riac/caf/"
)
message
(
STATUS
"Enter subdirectory probe"
)
add_subdirectory
(
libcaf_riac
)
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_dependencies
(
libcaf_riacStatic libcaf_ioStatic
)
endif
()
if
(
CAF_BUILD_STATIC_ONLY
)
set
(
LIBCAF_LIBRARIES
${
LIBCAF_LIBRARIES
}
libcaf_riacStatic
)
else
()
add_dependencies
(
libcaf_riac libcaf_io
)
set
(
LIBCAF_LIBRARIES
${
LIBCAF_LIBRARIES
}
libcaf_riac
)
endif
()
# add headers to include directories so other subprojects can use RIAC
include_directories
(
${
LIBCAF_INCLUDE_DIRS
}
"
${
CMAKE_SOURCE_DIR
}
/libcaf_riac"
)
# add libcaf_riac to the list of caf libraries
set
(
CAF_HAS_RIAC yes
)
set
(
CAF_NO_RIAC no
)
endif
()
# build nexus if not being told otherwise
# build nexus if not being told otherwise
if
(
NOT CAF_NO_NEXUS AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/nexus/caf/"
)
if
(
NOT CAF_NO_NEXUS AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/nexus/caf/"
)
if
(
NOT CAF_HAS_
PROBE_EVENTS
)
if
(
NOT CAF_HAS_
RIAC
)
message
(
WARNING
"cannot build nexus
: probe-event submodule missing
"
)
message
(
WARNING
"cannot build nexus
without RIAC submodule
"
)
set
(
CAF_NO_NEXUS yes
)
set
(
CAF_NO_NEXUS yes
)
else
()
else
()
message
(
STATUS
"Enter subdirectory nexus"
)
message
(
STATUS
"Enter subdirectory nexus"
)
add_subdirectory
(
nexus
)
add_subdirectory
(
nexus
)
add_dependencies
(
nexus libcaf_io
)
if
(
CAF_BUILD_STATIC_ONLY
)
add_dependencies
(
nexus libcaf_riacStatic
)
else
()
add_dependencies
(
nexus libcaf_riac
)
endif
()
set
(
CAF_NO_NEXUS no
)
set
(
CAF_NO_NEXUS no
)
endif
()
endif
()
else
()
else
()
...
@@ -289,43 +301,23 @@ else()
...
@@ -289,43 +301,23 @@ else()
endif
()
endif
()
# build shell if not being told otherwise
# build shell if not being told otherwise
if
(
NOT CAF_NO_SHELL AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/shell/caf/"
)
if
(
NOT CAF_NO_SHELL AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/shell/caf/"
)
if
(
NOT CAF_HAS_
PROBE_EVENTS
)
if
(
NOT CAF_HAS_
RIAC
)
message
(
WARNING
"cannot build shell
: probe-event submodule missing
"
)
message
(
WARNING
"cannot build shell
without RIAC submodule
"
)
set
(
CAF_NO_SHELL yes
)
set
(
CAF_NO_SHELL yes
)
else
()
else
()
message
(
STATUS
"Enter subdirectory shell"
)
message
(
STATUS
"Enter subdirectory shell"
)
add_subdirectory
(
shell
)
add_subdirectory
(
shell
)
add_dependencies
(
cash libcaf_io
)
if
(
CAF_BUILD_STATIC_ONLY
)
add_dependencies
(
cash libcaf_riacStatic
)
else
()
add_dependencies
(
cash libcaf_riac
)
endif
()
set
(
CAF_NO_SHELL no
)
set
(
CAF_NO_SHELL no
)
endif
()
endif
()
else
()
else
()
# make sure variable is set for build log
# make sure variable is set for build log
set
(
CAF_NO_SHELL yes
)
set
(
CAF_NO_SHELL yes
)
endif
()
endif
()
# build probe if not being told otherwise
if
(
NOT CAF_NO_PROBE AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/libcaf_probe/caf/"
)
if
(
NOT CAF_HAS_PROBE_EVENTS
)
message
(
WARNING
"cannot build probe: probe-event submodule missing"
)
set
(
CAF_NO_PROBE yes
)
else
()
message
(
STATUS
"Enter subdirectory probe"
)
add_subdirectory
(
libcaf_probe
)
if
(
CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC
)
add_dependencies
(
libcaf_probeStatic libcaf_ioStatic
)
endif
()
if
(
NOT CAF_BUILD_STATIC_ONLY
)
add_dependencies
(
libcaf_probe libcaf_io
)
endif
()
set
(
CAF_NO_PROBE no
)
endif
()
endif
()
# add probe-event if not told otherwise
if
(
NOT CAF_NO_PROBE_EVENT AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/probe-event/caf/"
)
message
(
STATUS
"Enter subdirectory probe-event"
)
add_subdirectory
(
probe-event
)
set
(
CAF_NO_PROBE_EVENT no
)
endif
()
# build benchmarks if not being told otherwise
# build benchmarks if not being told otherwise
if
(
NOT CAF_NO_BENCHMARKS AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/benchmarks/caf/"
)
if
(
NOT CAF_NO_BENCHMARKS AND EXISTS
"
${
CMAKE_SOURCE_DIR
}
/benchmarks/caf/"
)
message
(
STATUS
"Enter subdirectory benchmarks"
)
message
(
STATUS
"Enter subdirectory benchmarks"
)
...
@@ -385,7 +377,7 @@ endmacro()
...
@@ -385,7 +377,7 @@ endmacro()
invertYesNo
(
CAF_NO_EXAMPLES CAF_BUILD_EXAMPLES
)
invertYesNo
(
CAF_NO_EXAMPLES CAF_BUILD_EXAMPLES
)
invertYesNo
(
CAF_NO_UNIT_TESTS CAF_BUILD_UNIT_TESTS
)
invertYesNo
(
CAF_NO_UNIT_TESTS CAF_BUILD_UNIT_TESTS
)
invertYesNo
(
CAF_NO_NEXUS CAF_BUILD_NEXUS
)
invertYesNo
(
CAF_NO_NEXUS CAF_BUILD_NEXUS
)
invertYesNo
(
CAF_NO_
PROBE CAF_BUILD_PROBE
)
invertYesNo
(
CAF_NO_
RIAC CAF_BUILD_RIAC
)
invertYesNo
(
CAF_NO_SHELL CAF_BUILD_SHELL
)
invertYesNo
(
CAF_NO_SHELL CAF_BUILD_SHELL
)
invertYesNo
(
CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT
)
invertYesNo
(
CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT
)
invertYesNo
(
CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS
)
invertYesNo
(
CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS
)
...
@@ -408,9 +400,9 @@ message(STATUS
...
@@ -408,9 +400,9 @@ message(STATUS
"
\n
"
"
\n
"
"
\n
Build examples:
${
CAF_BUILD_EXAMPLES
}
"
"
\n
Build examples:
${
CAF_BUILD_EXAMPLES
}
"
"
\n
Build unit tests:
${
CAF_BUILD_UNIT_TESTS
}
"
"
\n
Build unit tests:
${
CAF_BUILD_UNIT_TESTS
}
"
"
\n
Build riac:
${
CAF_BUILD_RIAC
}
"
"
\n
Build nexus:
${
CAF_BUILD_NEXUS
}
"
"
\n
Build nexus:
${
CAF_BUILD_NEXUS
}
"
"
\n
Build shell:
${
CAF_BUILD_SHELL
}
"
"
\n
Build shell:
${
CAF_BUILD_SHELL
}
"
"
\n
Build probe:
${
CAF_BUILD_PROBE
}
"
"
\n
Build benchmarks:
${
CAF_BUILD_BENCHMARKS
}
"
"
\n
Build benchmarks:
${
CAF_BUILD_BENCHMARKS
}
"
"
\n
Build opencl:
${
CAF_BUILD_OPENCL
}
"
"
\n
Build opencl:
${
CAF_BUILD_OPENCL
}
"
"
\n
"
"
\n
"
...
...
libcaf_probe
@
8f5f7fca
Subproject commit 8f5f7fca1c1413f65613bf0df19f5995a88d40ce
libcaf_probe_event
@
f11a3057
Subproject commit f11a3057c83d3a20e7c669b6c224bea207c677e2
libcaf_riac
@
48a4c236
Subproject commit 48a4c236c35a3b04239ba08c3309f9b81ca7834e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment