p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabled count_cores build, #1865

This commit is contained in:
Brian Gerkey 2009-10-09 17:44:04 +00:00
parent 91226c01c9
commit 63bdce9e49
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/rosbuild/public.cmake
View File

@ -846,21 +846,23 @@ macro(rosbuild_make_distribution)
include(CPack)
endmacro(rosbuild_make_distribution)
# Compute the number of hardware cores on the machine. Intended to use for
# gating tests that have heavy processor requirements. It calls out to a
# helper program that uses boost::thread::hardware_concurrency().
macro(rosbuild_count_cores num)
execute_process(COMMAND $ENV{ROS_ROOT}/core/rosbuild/tests/count_cores
OUTPUT_VARIABLE _cores_out
ERROR_VARIABLE _cores_error
RESULT_VARIABLE _cores_result
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(_cores_result)
message(FATAL_ERROR "Failed to run count_cores")
endif(_cores_result)
set(${num} ${_cores_out})
endmacro(rosbuild_count_cores)
# rosbuild_count_cores() disabled until I can figure out how to build it
# without Boost, which causes bootstrapping problems, #1865
## Compute the number of hardware cores on the machine. Intended to use for
## gating tests that have heavy processor requirements. It calls out to a
## helper program that uses boost::thread::hardware_concurrency().
#macro(rosbuild_count_cores num)
# execute_process(COMMAND $ENV{ROS_ROOT}/core/rosbuild/tests/count_cores
# OUTPUT_VARIABLE _cores_out
# ERROR_VARIABLE _cores_error
# RESULT_VARIABLE _cores_result
# OUTPUT_STRIP_TRAILING_WHITESPACE)
# if(_cores_result)
# message(FATAL_ERROR "Failed to run count_cores")
# endif(_cores_result)
#
# set(${num} ${_cores_out})
#endmacro(rosbuild_count_cores)
# Check whether we're running as a VM Intended to use for
# gating tests that have heavy processor requirements. It checks for

6
core/rosbuild/tests/CMakeLists.txt
View File

@ -1,4 +1,6 @@
rosbuild_add_boost_directories()
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
add_executable(tests/count_cores count_cores.cpp)
rosbuild_link_boost(tests/count_cores thread)
# Can't build this because it needs Boost, and you need rosdep to install
# Boost, and you need rosbuild to build rosdep, etc., etc., #1865.
#add_executable(tests/count_cores count_cores.cpp)
#rosbuild_link_boost(tests/count_cores thread)