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

merging r15209 and r15208, patches from wjwwood for osx 64-bit

This commit is contained in:
Ken Conley 2011-10-19 23:30:53 +00:00
parent 7510566e5b
commit 547d7554f3
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rosbuild/rosbuild.cmake
View File

@ -15,6 +15,8 @@ if(COMMAND cmake_policy)
endif(POLICY CMP0011)
endif(COMMAND cmake_policy)
set(CMAKE_OSX_ARCHITECTURES "x86_64")
##############################################################################
# First things first: we must have rospack.
find_program(ROSPACK_EXE NAMES rospack DOC "rospack executable")

2
tools/rospack/CMakeLists.txt
View File

@ -7,6 +7,8 @@ endif()
cmake_minimum_required(VERSION 2.4.6)
set(CMAKE_BUILD_TYPE Release)
set(CMAKE_OSX_ARCHITECTURES "x86_64")
set(CMAKE_INSTALL_PREFIX /tmp/rospack)
#set(CMAKE_INSTALL_RPATH_USE_LINK_RPATH true)
#set(CMAKE_SKIP_BUILD_RPATH true)