From d7957c0feee381824caf895b6af16589aa6b4928 Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Wed, 10 Feb 2021 15:52:28 +0100
Subject: [PATCH] Update CMake install, Dockerfile and Valgrind (#218)

* Update Docker and install system

* Update valgrind

* Fix
---
 CMakeLists.txt         | 1 +
 CTestConfig.cmake      | 3 +--
 Dockerfile             | 3 +--
 cmake/SuperBuild.cmake | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3929f7c3..ae8a29bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_BINARY_DIR}/temp_install)
 foreach(d ${_deps})
     list(GET d 0 _name)
     list(GET d 1 _version)
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_BINARY_DIR}/temp_install/${_name}-${_version})
     find_package(${_name} ${_version} REQUIRED)
 endforeach()
 
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 4aef1028c..16d3d6aa0 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -15,8 +15,7 @@
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     # MemoryCheck configuration.
     find_program(MEMORYCHECK_COMMAND NAMES valgrind)
-    set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --quiet --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --xml=yes --xml-file=test_%p_memcheck.xml \"--suppressions=${CMAKE_CURRENT_SOURCE_DIR}/ci/valgrind.supp\"")
-
+    set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --log-fd=2 --quiet --tool=memcheck --leak-check=yes --show-reachable=yes --error-exitcode=1 --num-callers=50 \"--suppressions=${CMAKE_CURRENT_SOURCE_DIR}/ci/valgrind.supp\"")
     # Coverage configuration.
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         find_program(COVERAGE_COMMAND NAMES gcov)
diff --git a/Dockerfile b/Dockerfile
index e1621880f..4d8e681d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,9 +31,8 @@ ADD . /agent/
 # Build Micro XRCE-DDS Agent and install
 RUN cd /agent/build && \
     cmake -DCMAKE_INSTALL_PREFIX=../install \
-    -DUAGENT_ISOLATED_INSTALL=OFF \
     .. &&\
-    make && make install
+    make -j $(nproc) && make install
 
 # Prepare Micro XRCE-DDS Agent artifacts
 RUN cd /agent && \
diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
index eb2ff6a10..e4fa37a05 100644
--- a/cmake/SuperBuild.cmake
+++ b/cmake/SuperBuild.cmake
@@ -32,7 +32,7 @@ if(UAGENT_P2P_PROFILE)
             PREFIX
                 ${PROJECT_BINARY_DIR}/microxrcedds_client
             INSTALL_DIR
-                ${PROJECT_BINARY_DIR}/temp_install
+                ${PROJECT_BINARY_DIR}/temp_install/microxrcedds_client-${_microxrcedds_client_version}
             CMAKE_CACHE_ARGS
                 -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                 -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}