Changes in cmake scripts

MaHuaizhen · Feb 19, 2016 · 608963c · 608963c
1 parent 298e74d
commit 608963c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/CTestJenkins.cmake b/CTestJenkins.cmake
@@ -8,7 +8,7 @@ set(CTEST_CMAKE_GENERATOR "${JENKINS_GENERATOR}")
 set(CTEST_BUILD_OPTIONS "${JENKINS_BUILD_OPTIONS}")
 set(CTEST_BUILD_CONFIGURATION "${JENKINS_BUILD_CONFIGURATION}")
 
-set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "${CTEST_MEMORYCHECK_COMMAND_OPTIONS} -q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --xml=yes --xml-file=test_%p_memcheck.xml")
+set(CTEST_MEMORYCHECK_COMMAND_OPTIONS "${CTEST_MEMORYCHECK_COMMAND_OPTIONS} -q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --xml=yes --xml-file=test_%p_memcheck.xml --suppressions='${CTEST_SOURCE_DIRECTORY}/valgrind.supp'")
 
 set(CTEST_COVERAGE_CXX_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-fprofile-arcs -ftest-coverage")
 set(CTEST_COVERAGE_EXE_LD_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=-fprofile-arcs -ftest-coverage")

diff --git a/cmake/dev/eprosima_libraries.cmake b/cmake/dev/eprosima_libraries.cmake
@@ -71,7 +71,7 @@ macro(find_eprosima_package package)
                     )
 
                 if(NOT EXECUTE_RESULT EQUAL 0)
-                    message(FATAL_ERROR "Cannot build Git submodule ${package} in debug mode")
+                    message(FATAL_ERROR "Cannot build Git submodule ${package} in Debug mode")
                 endif()
 
                 execute_process(COMMAND ${CMAKE_COMMAND} --build . --config Release
@@ -80,7 +80,16 @@ macro(find_eprosima_package package)
                     )
 
                 if(NOT EXECUTE_RESULT EQUAL 0)
-                    message(FATAL_ERROR "Cannot build Git submodule ${package} in release mode")
+                    message(FATAL_ERROR "Cannot build Git submodule ${package} in Release mode")
+                endif()
+
+                execute_process(COMMAND ${CMAKE_COMMAND} --build . --config RelWithDebInfo
+                    WORKING_DIRECTORY ${${package}ExternalDir}
+                    RESULT_VARIABLE EXECUTE_RESULT
+                    )
+
+                if(NOT EXECUTE_RESULT EQUAL 0)
+                    message(FATAL_ERROR "Cannot build Git submodule ${package} in RelWithDebInfo mode")
                 endif()
             else()
                 execute_process(COMMAND ${CMAKE_COMMAND} --build .

diff --git a/thirdparty/fastcdr b/thirdparty/fastcdr
diff --git a/valgrind.supp b/valgrind.supp
@@ -0,0 +1,11 @@
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   obj:/usr/lib64/libstdc++.so.6.0.21
+   fun:call_init.part.0
+   fun:call_init
+   fun:_dl_init
+   obj:/usr/lib64/ld-2.21.so
+}