Revision: 8885
http://playerstage.svn.sourceforge.net/playerstage/?rev=8885&view=rev
Author: hsujohnhsu
Date: 2010-09-08 01:47:53 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
look for ompi using cmake
Modified Paths:
--------------
code/gazebo/branches/mpi/CMakeLists.txt
code/gazebo/branches/mpi/cmake/SearchForStuff.cmake
code/gazebo/branches/mpi/server/CMakeLists.txt
Modified: code/gazebo/branches/mpi/CMakeLists.txt
===================================================================
--- code/gazebo/branches/mpi/CMakeLists.txt 2010-09-07 23:45:52 UTC (rev
8884)
+++ code/gazebo/branches/mpi/CMakeLists.txt 2010-09-08 01:47:53 UTC (rev
8885)
@@ -47,6 +47,7 @@
set (FREEIMAGE_MAJOR_VERSION 3 CACHE INTERNAL "FreeImage major version
requirement" FORCE)
set (FREEIMAGE_MINOR_VERSION 9 CACHE INTERNAL "FreeImage minor version
requirement" FORCE)
set (FREEIMAGE_VERSION ${FREEIMAGE_MAJOR_VERSION}.${FREEIMAGE_MINOR_VERSION}.0
CACHE INTERNAL "FreeImage version requirement" FORCE)
+set (OMPI_VERSION 1.5rc5 CACHE INTERNAL "OpenMPI version requirement" FORCE)
set (ODE_VERSION 0.10.1 CACHE INTERNAL "ODE version requirement" FORCE)
set (MIN_BOOST_VERSION 1.35.0 CACHE INTERNAL "Boost min version requirement"
FORCE)
Modified: code/gazebo/branches/mpi/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/mpi/cmake/SearchForStuff.cmake 2010-09-07 23:45:52 UTC
(rev 8884)
+++ code/gazebo/branches/mpi/cmake/SearchForStuff.cmake 2010-09-08 01:47:53 UTC
(rev 8885)
@@ -45,6 +45,34 @@
#################################################
+ # Find OpenMPI OMPI
+ #message(status "\n\n\n\n\nOMPI: ompi>=${OMPI_VERSION}\n\n\n\n")
+ pkg_check_modules(OMPI ompi>=${OMPI_VERSION})
+ IF (NOT OMPI_FOUND)
+ MESSAGE ("OpenMPI and development files not found, will not compile with
OMPI. See the following website: http://www.open-mpi.org";)
+ SET (INCLUDE_OMPI FALSE CACHE BOOL "Include support for OMPI")
+ ELSE (NOT OMPI_FOUND)
+ SET (INCLUDE_OMPI TRUE CACHE BOOL "Include support for OMPI")
+
+ APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
+ ${gazeboserver_include_dirs_desc}
+ ${OMPI_INCLUDE_DIRS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_dirs
+ ${gazeboserver_link_dirs_desc}
+ ${OMPI_LIBRARY_DIRS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_libs
+ ${gazeboserver_link_libs_desc}
+ ${OMPI_LINK_LIBS})
+ APPEND_TO_CACHED_LIST(gazeboserver_link_libs
+ ${gazeboserver_link_libs_desc}
+ ${OMPI_LIBRARIES})
+ APPEND_TO_CACHED_LIST(gazeboserver_ldflags
+ ${gazeboserver_ldflags_desc}
+ ${OMPI_LDFLAGS})
+
+ ENDIF (NOT OMPI_FOUND)
+
+ #################################################
# Find ODE
pkg_check_modules(ODE ode>=${ODE_VERSION})
IF (NOT ODE_FOUND)
Modified: code/gazebo/branches/mpi/server/CMakeLists.txt
===================================================================
--- code/gazebo/branches/mpi/server/CMakeLists.txt 2010-09-07 23:45:52 UTC
(rev 8884)
+++ code/gazebo/branches/mpi/server/CMakeLists.txt 2010-09-08 01:47:53 UTC
(rev 8885)
@@ -1,5 +1,20 @@
include (${gazebo_cmake_dir}/GazeboUtils.cmake)
+# compiler for openmpi mpi
+if (INCLUDE_OMPI)
+ set(ompi_cc "" CACHE INTERNAL "OpenMPI CC Compiler")
+ set(ompi_cxx "" CACHE INTERNAL "OpenMPI CXX Compiler")
+ # Set compiler for openmpi mpi
+ if (ompi_cc)
+ set(CMAKE_C_COMPILER "${ompi_cc}")
+ endif (ompi_cc)
+ message(status "\n\n\n\n\ncc: ${CMAKE_C_COMPILER}\n\nompi_cc:
${ompi_cc}\n\n\n\n\n")
+ if (ompi_cxx)
+ set(CMAKE_CXX_COMPILER "${ompi_cxx}")
+ endif (ompi_cxx)
+ENDIF (INCLUDE_OMPI)
+
+
########################################
# Include all the search paths for headers
string (REPLACE " " ";" boost_include_dirs_split "${boost_include_dirs}")
@@ -152,6 +167,7 @@
set_target_properties(gazebo-exec PROPERTIES SKIP_BUILD_RPATH TRUE)
LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
+#message(status
"\n\n\n\n\n\n\n\ndebug:\n${GAZEBO_CFLAGS}\n\n${gazeboserver_cflags}\n\n${ompi_cflags}\n\n\n\n")
set_source_files_properties(${gazeboserver_sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
