Merge commit 'upstream/master'

Fixed conflicts between my stuff and old stuff.
Conflicts:
	libstageplugin/p_simulation.cc

.gitignore

@@ -1,2 +1,3 @@
 build
 config.h
+*.swp

AUTHORS.txt

@@ -14,7 +14,7 @@ terms of the GNU General Public License version 2 or later:
 - Jeremy Asher (jra11@sfu.ca)
 - Alex Couture-Beil (asc17@sfu.ca)
 - Geoff Biggs (git@killbots.net)
-
+- Rich Mattes (jpgr87@github.com)
 
 Many patches and bug reports have been contributed by users around the
 world.  Stage is part of the Player Project (http://playerstage.org), 

CMakeLists.txt

@@ -30,7 +30,7 @@ MESSAGE (STATUS "${PROJECT_NAME} version ${VERSION}")
 SET (PROJECT_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake CACHE PATH "Location of CMake scripts")
 # Determine the operating system in detail
 INCLUDE (${PROJECT_CMAKE_DIR}/internal/FindOS.cmake)
-
+INCLUDE (${PROJECT_CMAKE_DIR}/internal/UninstallTarget.cmake)
 # Enable -Wall by default unless on Win or Solaris
 IF (NOT PROJECT_OS_WIN AND NOT PROJECT_OS_SOLARIS)
     # Using -Wall on Windows causes MSVC to produce thousands of warnings in its
@@ -40,9 +40,9 @@ ENDIF (NOT PROJECT_OS_WIN AND NOT PROJECT_OS_SOLARIS)
 
 #####################################
 # Build type cflags
-SET (CMAKE_CXX_FLAGS_RELEASE " -O3 -DNDEBUG ${WALL} " CACHE INTERNAL "C Flags for release" FORCE)
+SET (CMAKE_CXX_FLAGS_RELEASE "  -DNDEBUG ${WALL} " CACHE INTERNAL "C Flags for release" FORCE)
 SET (CMAKE_CXX_FLAGS_DEBUG " -ggdb  ${WALL} " CACHE INTERNAL "C Flags for debug" FORCE)
-SET (CMAKE_CXX_FLAGS_PROFILE " -O3 -ggdb -pg ${WALL} " CACHE INTERNAL "C Flags for profile" FORCE)
+SET (CMAKE_CXX_FLAGS_PROFILE "  -ggdb -pg ${WALL} " CACHE INTERNAL "C Flags for profile" FORCE)
 
 #####################################
 # Set the default build type
@@ -140,6 +140,16 @@ STRING(REGEX REPLACE "\n" ";" FLTK_LIBS "${FLTK_LIBS_NEWLINES}")
 #MESSAGE( STATUS "    FLTK_LDFLAGS = ${FLTK_LDFLAGS}")
 #MESSAGE( STATUS "    FLTK_LIBS = ${FLTK_LIBS}")
 
+STRING(REGEX REPLACE " -lGLU" "" TMP "${FLTK_LDFLAGS}")
+STRING(REGEX REPLACE " -lGL" "" TMP2 "${TMP}")
+STRING(REGEX REPLACE " -lpng" "" FLTK_LDFLAGS_PKGCONFIG "${TMP2}")
+
+
+STRING(REGEX REPLACE " -lgl" "" FLTK_LIBS_PKGCONFIG "${FLTK_LIBS}")
+STRING(REGEX REPLACE " -lglu" "" FLTK_LIBS_PKGCONFIG" "${FLTK_LIBS_PKGCONFIG}")
+STRING(REGEX REPLACE " -lpng" "" FLTK_LIBS_PKGCONFIG" "${FLTK_LIBS_PKGCONFIG}")
+
+
 SET (FLTK_FOUND TRUE)
 
 # ENDIF( BUILD_GUI )
@@ -162,7 +172,7 @@ IF( PLAYER_FOUND )
 #  MESSAGE( STATUS "    PLAYER_CFLAGS: ${PLAYER_CFLAGS}" )
 #  MESSAGE( STATUS "    PLAYER_LDFLAGS: ${PLAYER_LDFLAGS}"  )
 ELSE( PLAYER_FOUND )
-  MESSAGE( ${INDENT} "Player not detected. If Player is installed but not detected, check your PKG_CONFIG_PATH." )
+  MESSAGE(STATUS ${INDENT} "Player not detected. If Player is installed but not detected, check your PKG_CONFIG_PATH." )
 ENDIF( PLAYER_FOUND )
 
 
@@ -178,7 +188,7 @@ ENDIF( PLAYER_FOUND )
 
 # Create the pkgconfig file
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage.pc.in ${CMAKE_CURRENT_BINARY_DIR}/stage.pc @ONLY)
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage.pc DESTINATION lib/pkgconfig/)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage.pc DESTINATION ${PROJECT_LIB_DIR}/pkgconfig/)
 
 MESSAGE( STATUS "Installation path CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" )
 

cmake/internal/FindOS.cmake

@@ -43,3 +43,30 @@ ELSEIF (PROJECT_OS_SOLARIS)
 ELSE (PROJECT_OS_LINUX)
     MESSAGE (STATUS "Operating system is generic Unix")
 ENDIF (PROJECT_OS_LINUX)
+
+# 32 or 64 bit Linux
+IF (PROJECT_OS_LINUX)
+    # Set the library directory suffix accordingly
+    IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+        MESSAGE (STATUS "Linux x86_64 Detected")
+    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+        MESSAGE (STATUS "Linux ppc64 Detected")
+        SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+    ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
+	MESSAGE (STATEUS "Linux s390x Detected")
+	SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+    ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ENDIF (PROJECT_OS_LINUX)
+
+IF(PROJECT_PROC_64BIT)
+    # Set the install path to lib64
+    SET(PROJECT_LIB_DIR "lib64")
+    SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
+ELSE (PROJECT_PROC_64BIT)
+    SET(PROJECT_LIB_DIR "lib")
+    SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}")
+ENDIF (PROJECT_PROC_64BIT)
+
+MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}")
+MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}")

cmake/internal/UninstallTarget.cmake

@@ -0,0 +1,5 @@
+# Add an "uninstall" target
+
+CONFIGURE_FILE ("${PROJECT_CMAKE_DIR}/internal/cmake_uninstall.cmake.in" "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET (uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake")

cmake/internal/cmake_uninstall.cmake.in

@@ -0,0 +1,21 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)

config.h.in

@@ -5,6 +5,7 @@
 #define VERSION "@VERSION@"
 #define APIVERSION "@APIVERSION@"
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define PLUGIN_PATH "@CMAKE_INSTALL_PREFIX@/@PROJECT_PLUGIN_DIR@"
 
 #cmakedefine BUILD_GUI
 

examples/ctrl/CMakeLists.txt

@@ -23,30 +23,19 @@ foreach( PLUGIN ${PLUGINS} )
 endforeach( PLUGIN )
 
 ADD_LIBRARY( fasr2 MODULE fasr2.cc astar/findpath.cpp )
-#ADD_LIBRARY( fasr3 MODULE fasr3.cc astar/findpath.cpp )
 
 # add fasr2 to the list of plugins
-SET( PLUGINS ${PLUGINS} fasr2)# fasr3)
+SET( PLUGINS ${PLUGINS} fasr2 )
 
 set_source_files_properties( ${PLUGINS} PROPERTIES COMPILE_FLAGS "${FLTK_CFLAGS}" )
 
 foreach( PLUGIN ${PLUGINS} )
-  TARGET_LINK_LIBRARIES( ${PLUGIN} stage )
+  TARGET_LINK_LIBRARIES( ${PLUGIN} stage ${OPENGL_LIBRARIES} )
 endforeach( PLUGIN )
 
-
 # delete the "lib" prefix from the plugin libraries
 SET_TARGET_PROPERTIES( ${PLUGINS} PROPERTIES PREFIX "" )
 
-# need plaer's wavefront planning library for this one
-#if( PLAYER_FOUND )  
-#  link_directories( ${PLAYER_LIBRARY_DIRS} )
-#  include_directories( ${PLAYER_INCLUDE_DIRS} )
-#  target_link_libraries( fasr_plan "-lwavefront_standalone" )
-#endif( PLAYER_FOUND )
-
-
-
 # install in <prefix>/lib
-install( TARGETS ${PLUGINS} fasr2 DESTINATION lib) #fasr3 
+install( TARGETS ${PLUGINS} DESTINATION ${PROJECT_PLUGIN_DIR})