Skip to content

Commit d94fa3d

Browse files
theZiztheZiz
authored
Merge pull request #60 from ComputationalRadiationPhysics/dev
Updating Master Branch to Dev branch
2 parents a2af3b8 + 8833ac4 commit d94fa3d

File tree

4 files changed

+81
-14
lines changed

4 files changed

+81
-14
lines changed

‎lib/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
cmake_minimum_required (VERSION 3.3)
22
project (isaac)
33

4+
configure_file (
5+
"${PROJECT_SOURCE_DIR}/ISAACConfigVersion.cmake.in"
6+
"${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake"
7+
@ONLY
8+
)
9+
410
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/isaac.hpp" DESTINATION "include" )
511
install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/isaac" DESTINATION "include" PATTERN "mainpage.dox" EXCLUDE )
6-
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/ISAACConfig.cmake" DESTINATION "lib/cmake/isaac" )
12+
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/ISAACConfig.cmake" DESTINATION "lib/cmake/ISAAC" )
13+
install( FILES "${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake" DESTINATION "lib/cmake/ISAAC" )

‎lib/ISAACConfig.cmake‎

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# - Config file for the isaac package
22
# It defines the following variables
3-
# ISAAC_INCLUDE_DIRS - include directories for FooBar
4-
# ISAAC_LIBRARIES - libraries to link against
5-
# ISAAC_DEFINITIONS - necessary definitions
6-
# ISAAC_FOUND - whether ISAAC was found and is useable
3+
# ISAAC_INCLUDE_DIRS - include directories for FooBar
4+
# ISAAC_LIBRARIES - libraries to link against
5+
# ISAAC_DEFINITIONS - necessary definitions
6+
# ISAAC_FOUND - whether ISAAC was found and is useable
7+
# ISAAC_DEPENDENCY_HINTS - hints about missing dependencies
78
#
89
# It defines the following options
910
# ISAAC_THREADING
@@ -26,7 +27,6 @@ set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}/isaac")
2627
###############################################################################
2728
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ISAAC_DIR}/Modules")
2829

29-
3030
###############################################################################
3131
# OPTIONS
3232
###############################################################################
@@ -72,26 +72,37 @@ if (ISAAC_VALGRIND_TWEAKS)
7272
set(ISAAC_DEFINITIONS ${ISAAC_DEFINITIONS} -DISAAC_VALGRIND_TWEAKS)
7373
endif ()
7474

75+
set(ISAAC_DEPENDENCY_HINTS "missing dependencies:")
76+
7577
###############################################################################
7678
# JANSSON LIB
7779
###############################################################################
7880
# set(JANSSON_DIR JANSSON_DIR_NOT-FOUND CACHE PATH "The location of the jansson library")
79-
find_package (Jansson CONFIG)
81+
find_package (Jansson CONFIG QUIET)
82+
if (NOT Jansson_FOUND)
83+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- libJansson")
84+
endif()
8085
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${JANSSON_LIBRARIES})
8186
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS})
8287

8388

8489
###############################################################################
8590
# PTHREADS
8691
###############################################################################
87-
find_package (Threads MODULE)
92+
find_package (Threads MODULE QUIET)
93+
if (NOT Threads_FOUND)
94+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- pThreads")
95+
endif()
8896
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
8997

9098

9199
################################################################################
92100
# IceT LIB
93101
################################################################################
94-
find_package (IceT CONFIG)
102+
find_package (IceT CONFIG QUIET)
103+
if (NOT IceT_FOUND)
104+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- IceT")
105+
endif()
95106
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${ICET_CORE_LIBS})
96107
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${ICET_MPI_LIBS})
97108
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${ICET_INCLUDE_DIRS})
@@ -100,7 +111,10 @@ set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${ICET_INCLUDE_DIRS})
100111
################################################################################
101112
# BOOST LIB
102113
################################################################################
103-
find_package(Boost 1.56.0 MODULE)
114+
find_package(Boost 1.56.0 MODULE QUIET)
115+
if (NOT Boost_FOUND)
116+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- Boost")
117+
endif()
104118
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
105119
set(ISAAC_DEFINITIONS ${ISAAC_DEFINITIONS} -DBOOST_ALL_NO_LIB)
106120

@@ -110,7 +124,7 @@ set(ISAAC_PRIVATE_FOUND true)
110124
# CUDA LIB
111125
################################################################################
112126
if (ISAAC_CUDA)
113-
find_package( CUDA 7.0 )
127+
find_package( CUDA 7.0 QUIET)
114128
if (!CUDA_FOUND)
115129
set(ISAAC_PRIVATE_FOUND false)
116130
else()
@@ -123,9 +137,10 @@ endif()
123137
# Alpaka LIB
124138
################################################################################
125139
if (ISAAC_ALPAKA)
126-
find_package(alpaka)
140+
find_package(alpaka QUIET)
127141
if (!alpaka_FOUND)
128142
set(ISAAC_PRIVATE_FOUND false)
143+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- Cuda or Alpaka")
129144
else()
130145
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${alpaka_INCLUDE_DIRS})
131146
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${alpaka_LIBRARIES})
@@ -142,7 +157,10 @@ list(REMOVE_DUPLICATES CUDA_NVCC_FLAGS)
142157
################################################################################
143158
# MPI LIB
144159
################################################################################
145-
find_package(MPI MODULE)
160+
find_package(MPI MODULE QUIET)
161+
if (NOT MPI_FOUND)
162+
set(ISAAC_DEPENDENCY_HINTS ${ISAAC_DEPENDENCY_HINTS} "\n-- MPI")
163+
endif()
146164
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} ${MPI_C_INCLUDE_PATH})
147165
set(ISAAC_LIBRARIES ${ISAAC_LIBRARIES} ${MPI_C_LIBRARIES})
148166
if (ISAAC_PRIVATE_FOUND)
@@ -165,5 +183,18 @@ endif()
165183
################################################################################
166184
# Returning whether ISAAC could be found
167185
################################################################################
186+
168187
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ISAAC
169-
REQUIRED_VARS ISAAC_LIBRARIES ISAAC_INCLUDE_DIRS JANSSON_LIBRARIES JANSSON_INCLUDE_DIRS CMAKE_THREAD_LIBS_INIT ISAAC_MPI_FOUND ICET_CORE_LIBS ICET_MPI_LIBS ICET_INCLUDE_DIRS Boost_FOUND ISAAC_PRIVATE_FOUND)
188+
REQUIRED_VARS
189+
ISAAC_LIBRARIES
190+
ISAAC_INCLUDE_DIRS
191+
JANSSON_LIBRARIES
192+
JANSSON_INCLUDE_DIRS
193+
CMAKE_THREAD_LIBS_INIT
194+
ISAAC_MPI_FOUND
195+
ICET_CORE_LIBS
196+
ICET_MPI_LIBS
197+
ICET_INCLUDE_DIRS
198+
Boost_FOUND
199+
ISAAC_PRIVATE_FOUND
200+
)

‎lib/ISAACConfigVersion.cmake.in‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
file(STRINGS "@CMAKE_INSTALL_PREFIX@/include/isaac/isaac_version.hpp" ISAAC_VERSION_MAJOR_HPP REGEX "#define ISAAC_VERSION_MAJOR ")
2+
file(STRINGS "@CMAKE_INSTALL_PREFIX@/include/isaac/isaac_version.hpp" ISAAC_VERSION_MINOR_HPP REGEX "#define ISAAC_VERSION_MINOR ")
3+
file(STRINGS "@CMAKE_INSTALL_PREFIX@/include/isaac/isaac_version.hpp" ISAAC_VERSION_PATCH_HPP REGEX "#define ISAAC_VERSION_PATCH ")
4+
5+
string(REGEX MATCH "([0-9]+)" ISAAC_VERSION_MAJOR ${ISAAC_VERSION_MAJOR_HPP})
6+
string(REGEX MATCH "([0-9]+)" ISAAC_VERSION_MINOR ${ISAAC_VERSION_MINOR_HPP})
7+
string(REGEX MATCH "([0-9]+)" ISAAC_VERSION_PATCH ${ISAAC_VERSION_PATCH_HPP})
8+
9+
set(PACKAGE_VERSION "${ISAAC_VERSION_MAJOR}.${ISAAC_VERSION_MINOR}.${ISAAC_VERSION_PATCH}")
10+
11+
# Check whether the requested PACKAGE_FIND_VERSION is exactly the one requested
12+
if("${PACKAGE_VERSION}" EQUAL "${PACKAGE_FIND_VERSION}")
13+
set(PACKAGE_VERSION_EXACT TRUE)
14+
else()
15+
set(PACKAGE_VERSION_EXACT FALSE)
16+
endif()
17+
18+
# Check whether the requested PACKAGE_FIND_VERSION is compatible
19+
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
20+
set(PACKAGE_VERSION_COMPATIBLE FALSE)
21+
else()
22+
set(PACKAGE_VERSION_COMPATIBLE TRUE)
23+
if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
24+
set(PACKAGE_VERSION_EXACT TRUE)
25+
endif()
26+
endif()
27+

‎server/src/Broker.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ errorCode Broker::run()
325325
json_t* js;
326326
if ( js = json_object_get(message->json_root, "init") )
327327
{
328+
json_t* json_id = json_object_get( insitu->t->group->initData, "id" );
329+
json_object_set( js, "id", json_id );
328330
json_decref( insitu->t->group->initData );
329331
insitu->t->group->initData = js;
330332
json_incref( js );

0 commit comments

Comments
 (0)