Commit 0dab8a1a authored by Dominik Charousset's avatar Dominik Charousset

Enforce naming schemes for CAF sublibraries

parent a6dd2bc4
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
path = benchmarks path = benchmarks
url = https://github.com/actor-framework/benchmarks.git url = https://github.com/actor-framework/benchmarks.git
[submodule "probe-event"] [submodule "probe-event"]
path = probe-event path = libcaf_probe_event
url = https://github.com/actor-framework/probe-event.git 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"] [submodule "probe"]
path = probe path = libcaf_probe
url = https://github.com/actor-framework/probe.git url = https://github.com/actor-framework/probe.git
[submodule "shell"] [submodule "shell"]
path = shell path = shell
......
...@@ -210,12 +210,12 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf) ...@@ -210,12 +210,12 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf)
endif() endif()
# path to probe-event headers (if submodule is loaded) # path to probe-event headers (if submodule is loaded)
if(EXISTS "${CMAKE_SOURCE_DIR}/probe-event/caf") if(EXISTS "${CMAKE_SOURCE_DIR}/libcaf_probe_event/caf")
set(LIBCAF_INCLUDE_DIRS set(LIBCAF_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/probe-event/ ${LIBCAF_INCLUDE_DIRS}) ${CMAKE_SOURCE_DIR}/libcaf_probe_event/ ${LIBCAF_INCLUDE_DIRS})
# make files from probe-event show up in IDE # make files from probe-event show up in IDE
file(GLOB PROBE_EVENTS_HDRS file(GLOB PROBE_EVENTS_HDRS
"${CMAKE_SOURCE_DIR}/probe-event/caf/probe_event/*.hpp") "${CMAKE_SOURCE_DIR}/libcaf_probe_event/caf/probe_event/*.hpp")
add_custom_target(caf_probe_events_dummy SOURCES ${PROBE_EVENTS_HDRS}) add_custom_target(caf_probe_events_dummy SOURCES ${PROBE_EVENTS_HDRS})
set(CAF_HAS_PROBE_EVENTS yes) set(CAF_HAS_PROBE_EVENTS yes)
endif() endif()
...@@ -309,7 +309,7 @@ if(NOT CAF_NO_PROBE AND EXISTS "${CMAKE_SOURCE_DIR}/probe/caf/") ...@@ -309,7 +309,7 @@ if(NOT CAF_NO_PROBE AND EXISTS "${CMAKE_SOURCE_DIR}/probe/caf/")
set(CAF_NO_PROBE yes) set(CAF_NO_PROBE yes)
else() else()
message(STATUS "Enter subdirectory probe") message(STATUS "Enter subdirectory probe")
add_subdirectory(probe) add_subdirectory(libcaf_probe)
if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) if(CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_dependencies(libcaf_probeStatic libcaf_ioStatic) add_dependencies(libcaf_probeStatic libcaf_ioStatic)
endif() endif()
......
File moved
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment