diff -up ./cmake/gazebo-config.cmake.in.fedora ./cmake/gazebo-config.cmake.in
--- ./cmake/gazebo-config.cmake.in.fedora 2019-02-04 20:53:43.843333899 -0500
+++ ./cmake/gazebo-config.cmake.in 2019-02-04 20:53:51.712364530 -0500
@@ -156,7 +156,7 @@ set(CMAKE_MODULE_PATH
"${OGRE_INSTALL_PREFIX}/share/OGRE/cmake/modules;${OGRE_INSTALL_PREFIX}/lib/OGRE/cmake;${OGRE_INSTALL_PREFIX}/CMake;${CMAKE_MODULE_PATH}")
# Find boost
-find_package(Boost @MIN_BOOST_VERSION@ REQUIRED thread signals system
+find_package(Boost @MIN_BOOST_VERSION@ REQUIRED thread system
filesystem program_options regex iostreams date_time)
list(APPEND @PKG_NAME@_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
list(APPEND @PKG_NAME@_LIBRARIES ${Boost_LIBRARIES})
diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake
--- ./cmake/SearchForStuff.cmake.fedora 2018-11-19 17:34:10.000000000 -0500
+++ ./cmake/SearchForStuff.cmake 2019-02-04 20:53:15.293222760 -0500
@@ -502,6 +502,13 @@ if (PKG_CONFIG_FOUND)
endif ()
########################################
+ # Find SkyX
+ pkg_check_modules(SKYX SKYX)
+ if (NOT SKYX_FOUND)
+ BUILD_WARNING("SkyX not found, using private copy of SkyX")
+ endif()
+
+ ########################################
# Find Player
pkg_check_modules(PLAYER playercore>=3.0 playerc++ playerwkb)
if (NOT PLAYER_FOUND)
@@ -600,11 +607,11 @@ find_package(Qt5 COMPONENTS Core Widgets
########################################
# Find Boost, if not specified manually
include(FindBoost)
-find_package(Boost ${MIN_BOOST_VERSION} REQUIRED thread signals system filesystem program_options regex iostreams date_time)
+find_package(Boost ${MIN_BOOST_VERSION} REQUIRED thread system filesystem program_options regex iostreams date_time)
if (NOT Boost_FOUND)
set (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
- BUILD_ERROR ("Boost not found. Please install thread signals system filesystem program_options regex date_time boost version ${MIN_BOOST_VERSION} or higher.")
+ BUILD_ERROR ("Boost not found. Please install thread signals system filesystem program_options regex iostreams date_time boost version ${MIN_BOOST_VERSION} or higher.")
endif()
########################################
@@ -795,7 +802,7 @@ endif()
########################################
# Find QWT (QT graphing library)
find_path(QWT_INCLUDE_DIR NAMES qwt.h PATHS
- /usr/include
+ /usr/include/qt5
/usr/local/include
/usr/local/lib/qwt.framework/Headers
${QWT_WIN_INCLUDE_DIR}
diff -up ./gazebo/rendering/Camera.cc.fedora ./gazebo/rendering/Camera.cc
--- ./gazebo/rendering/Camera.cc.fedora 2018-11-19 17:34:12.000000000 -0500
+++ ./gazebo/rendering/Camera.cc 2019-02-04 20:52:55.797154299 -0500
@@ -36,7 +36,7 @@
#include "gazebo/common/win_dirent.h"
#endif
-#include "gazebo/rendering/skyx/include/SkyX.h"
+#include "SkyX.h"
#include "gazebo/common/Assert.hh"
#include "gazebo/common/Events.hh"
diff -up ./gazebo/rendering/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt
--- ./gazebo/rendering/CMakeLists.txt.fedora 2018-11-19 17:34:12.000000000 -0500
+++ ./gazebo/rendering/CMakeLists.txt 2019-02-04 20:52:55.797154299 -0500
@@ -3,10 +3,15 @@ include (${gazebo_cmake_dir}/GazeboUtils
include_directories(SYSTEM
${OGRE_INCLUDE_DIRS}
${TBB_INCLUDEDIR}
- skyx
- skyx/include
)
+if (SKYX_FOUND)
+ include_directories(SYSTEM ${SKYX_INCLUDE_DIRS})
+else()
+ include_directories(skyx skyx/include)
+endif()
+
+
if (WIN32)
include_directories(${libdl_include_dir})
endif()
@@ -146,7 +151,10 @@ if (${OGRE_VERSION} VERSION_GREATER 1.7.
endif()
add_subdirectory(selection_buffer)
+
+if (NOT SKYX_FOUND)
add_subdirectory(skyx)
+endif()
if (HAVE_OCULUS)
set (sources ${sources}
@@ -229,6 +237,10 @@ target_link_libraries(gazebo_rendering
${IGNITION-MSGS_LIBRARIES}
)
+if (SKYX_FOUND)
+ target_link_libraries(gazebo_rendering ${SKYX_LIBRARIES})
+endif()
+
if (HAVE_OCULUS)
target_link_libraries(gazebo_rendering ${OculusVR_LIBRARIES})
endif()