|
 |
5742ef3 |
diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake
|
|
|
5742ef3 |
--- ./cmake/SearchForStuff.cmake.fedora 2016-07-13 20:31:07.000000000 -0400
|
|
|
5742ef3 |
+++ ./cmake/SearchForStuff.cmake 2016-07-17 18:20:33.209143562 -0400
|
|
|
5742ef3 |
@@ -450,6 +450,13 @@ if (PKG_CONFIG_FOUND)
|
|
|
5742ef3 |
endif ()
|
|
|
5742ef3 |
|
|
|
5742ef3 |
########################################
|
|
|
5742ef3 |
+ # Find SkyX
|
|
|
5742ef3 |
+ pkg_check_modules(SKYX SKYX)
|
|
|
5742ef3 |
+ if (NOT SKYX_FOUND)
|
|
|
5742ef3 |
+ BUILD_WARNING("SkyX not found, using private copy of SkyX")
|
|
|
5742ef3 |
+ endif()
|
|
|
5742ef3 |
+
|
|
|
5742ef3 |
+ ########################################
|
|
|
5742ef3 |
# Find Player
|
|
|
5742ef3 |
pkg_check_modules(PLAYER playercore>=3.0 playerc++ playerwkb)
|
|
|
5742ef3 |
if (NOT PLAYER_FOUND)
|
|
|
5742ef3 |
diff -up ./gazebo/rendering/Camera.cc.fedora ./gazebo/rendering/Camera.cc
|
|
|
5742ef3 |
--- ./gazebo/rendering/Camera.cc.fedora 2016-07-13 20:31:08.000000000 -0400
|
|
|
5742ef3 |
+++ ./gazebo/rendering/Camera.cc 2016-07-17 18:20:33.210143600 -0400
|
|
|
5742ef3 |
@@ -36,7 +36,7 @@
|
|
|
5742ef3 |
// Moved to top to avoid osx compilation errors
|
|
|
5742ef3 |
#include "gazebo/math/Rand.hh"
|
|
|
5742ef3 |
|
|
|
5742ef3 |
-#include "gazebo/rendering/skyx/include/SkyX.h"
|
|
|
5742ef3 |
+#include "SkyX.h"
|
|
|
5742ef3 |
|
|
|
5742ef3 |
#include "gazebo/common/Assert.hh"
|
|
|
5742ef3 |
#include "gazebo/common/Events.hh"
|
|
|
5742ef3 |
diff -up ./gazebo/rendering/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt
|
|
|
5742ef3 |
--- ./gazebo/rendering/CMakeLists.txt.fedora 2016-07-13 20:31:08.000000000 -0400
|
|
|
5742ef3 |
+++ ./gazebo/rendering/CMakeLists.txt 2016-07-17 18:23:58.644086518 -0400
|
|
|
5742ef3 |
@@ -3,10 +3,13 @@ include (${gazebo_cmake_dir}/GazeboUtils
|
|
|
5742ef3 |
include_directories(SYSTEM
|
|
|
5742ef3 |
${OGRE_INCLUDE_DIRS}
|
|
|
5742ef3 |
${TBB_INCLUDEDIR}
|
|
|
5742ef3 |
- skyx
|
|
|
5742ef3 |
- skyx/include
|
|
|
5742ef3 |
)
|
|
|
5742ef3 |
|
|
|
5742ef3 |
+if (SKYX_FOUND)
|
|
|
5742ef3 |
+ include_directories(SYSTEM ${SKYX_INCLUDE_DIRS})
|
|
|
5742ef3 |
+else()
|
|
|
5742ef3 |
+ include_directories(skyx skyx/include)
|
|
|
5742ef3 |
+endif()
|
|
|
5742ef3 |
|
|
|
5742ef3 |
if (WIN32)
|
|
|
5742ef3 |
include_directories(${libdl_include_dir})
|
|
|
5742ef3 |
@@ -133,7 +136,10 @@ if (${OGRE_VERSION} VERSION_GREATER 1.7.
|
|
|
5742ef3 |
endif()
|
|
|
5742ef3 |
|
|
|
5742ef3 |
add_subdirectory(selection_buffer)
|
|
|
5742ef3 |
+
|
|
|
5742ef3 |
+if (NOT SKYX_FOUND)
|
|
|
5742ef3 |
add_subdirectory(skyx)
|
|
|
5742ef3 |
+endif()
|
|
|
5742ef3 |
|
|
|
5742ef3 |
if (HAVE_OCULUS)
|
|
|
5742ef3 |
set (sources ${sources}
|
|
|
5742ef3 |
@@ -196,6 +202,10 @@ target_link_libraries(gazebo_rendering
|
|
|
5742ef3 |
${tinyxml_LIBRARIES}
|
|
|
5742ef3 |
)
|
|
|
5742ef3 |
|
|
|
5742ef3 |
+if (SKYX_FOUND)
|
|
|
5742ef3 |
+ target_link_libraries(gazebo_rendering ${SKYX_LIBRARIES})
|
|
|
5742ef3 |
+endif()
|
|
|
5742ef3 |
+
|
|
|
5742ef3 |
if (HAVE_OCULUS)
|
|
|
5742ef3 |
target_link_libraries(gazebo_rendering ${OculusVR_LIBRARIES})
|
|
|
5742ef3 |
endif()
|