Commit 2c5c1add authored by Jussi Lindgren's avatar Jussi Lindgren
Browse files

Build: Fixed compilation on Ubuntu 16.04

parent b7c524ba
...@@ -24,18 +24,18 @@ ENDIF(WIN32) ...@@ -24,18 +24,18 @@ ENDIF(WIN32)
IF(UNIX) IF(UNIX)
INCLUDE("FindPkgConfig") INCLUDE("FindPkgConfig")
SET(CEGUI_FOUND "-NOTFOUND") SET(CEGUI_FOUND "-NOTFOUND")
pkg_check_modules(CEGUI CEGUI) pkg_check_modules(CEGUI QUIET CEGUI)
IF(NOT CEGUI_FOUND) IF(NOT CEGUI_FOUND)
# we have this mess as the cegui filenames & paths are different on Fedora 21 at least, # we have this mess as the cegui filenames & paths are different on Fedora 21 at least,
# and the include_dirs doesn't contain the CEGUI/ part ... I'd put that to the .h/.cpp IF the same path # and the include_dirs doesn't contain the CEGUI/ part ... I'd put that to the .h/.cpp IF the same path
# convention was the case on all platforms... but it is not # convention was the case on all platforms... but it is not
pkg_check_modules(CEGUI CEGUI-0) pkg_check_modules(CEGUI QUIET CEGUI-0)
SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI") SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI")
ENDIF(NOT CEGUI_FOUND) ENDIF(NOT CEGUI_FOUND)
SET(OgreCEGUIRenderer_FOUND "-NOTFOUND") SET(OgreCEGUIRenderer_FOUND "-NOTFOUND")
pkg_check_modules(OgreCEGUIRenderer CEGUI-OGRE) pkg_check_modules(OgreCEGUIRenderer QUIET CEGUI-OGRE)
IF(NOT OgreCEGUIRenderer_FOUND) IF(NOT OgreCEGUIRenderer_FOUND)
pkg_check_modules(OgreCEGUIRenderer CEGUI-0-OGRE) pkg_check_modules(OgreCEGUIRenderer QUIET CEGUI-0-OGRE)
ENDIF(NOT OgreCEGUIRenderer_FOUND) ENDIF(NOT OgreCEGUIRenderer_FOUND)
ENDIF(UNIX) ENDIF(UNIX)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/thread/condition.hpp> #include <boost/thread/condition.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#include <boost/scoped_ptr.hpp>
#include <sys/timeb.h> #include <sys/timeb.h>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/scoped_ptr.hpp>
using namespace std; using namespace std;
......
...@@ -358,12 +358,18 @@ if [[ ! -e "$ov_target_folder_hit/no-native-packages.hit" ]]; then ...@@ -358,12 +358,18 @@ if [[ ! -e "$ov_target_folder_hit/no-native-packages.hit" ]]; then
ov_native_package_installed=true ov_native_package_installed=true
ov_native_package_log_file="$ov_target_folder_log/native-packages.log" ov_native_package_log_file="$ov_target_folder_log/native-packages.log"
ov_ubuntu_version=`lsb_release -r -s 2>/dev/null` ov_ubuntu_version=`lsb_release -r -s 2>/dev/null`
if [[ `expr $ov_ubuntu_version \>= 14.04` == 1 ]]; then # Ubuntu versions might need slightly different packages...
# at the time of writing this, there was a conflict between libogre-dev and libboost-thread-dev dependencies in 13.10 and 14.04 if [[ `expr $ov_ubuntu_version \>= 16.04` == 1 ]]; then
echo " Ubuntu $ov_ubuntu_version detected, suggesting specific set of packages..." echo " Ubuntu >= 16.04 detected, suggesting specific set of packages..."
ov_lib_ogre_dev=libogre-1.9-dev
ov_lib_libboost_chrono_dev=libboost-chrono1.58-dev
elif [[ `expr $ov_ubuntu_version \>= 14.04` == 1 ]]; then
echo " Ubuntu >= 14.04 detected, suggesting specific set of packages..."
ov_lib_ogre_dev=libogre-1.8-dev ov_lib_ogre_dev=libogre-1.8-dev
ov_lib_libboost_chrono_dev=libboost-chrono1.54-dev ov_lib_libboost_chrono_dev=libboost-chrono1.54-dev
else else
echo " Ubuntu seems older than v14.04 ..."
ov_lib_ogre_dev=libogre-dev ov_lib_ogre_dev=libogre-dev
ov_lib_libboost_chrono_dev= ov_lib_libboost_chrono_dev=
fi; fi;
...@@ -521,7 +527,7 @@ ov_package_url_itpp=http://openvibe.inria.fr/dependencies/linux-x86/itpp-4.0.7.t ...@@ -521,7 +527,7 @@ ov_package_url_itpp=http://openvibe.inria.fr/dependencies/linux-x86/itpp-4.0.7.t
ov_package_url_vrpn=http://openvibe.inria.fr/dependencies/linux-x86/vrpn_07_31-ov.zip ov_package_url_vrpn=http://openvibe.inria.fr/dependencies/linux-x86/vrpn_07_31-ov.zip
# LabStreamingLayer # LabStreamingLayer
ov_package_url_liblsl=http://openvibe.inria.fr/dependencies/linux-x86/liblsl-1.04-src.tar.bz2 ov_package_url_liblsl=http://openvibe.inria.fr/dependencies/linux-x86/liblsl-1.04.ov1-src.tar.bz2
############################################## ##############################################
## ## ## ##
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment