🐛 Fixed linking Caelum on Linux

RigsOfRods · Nov 28, 2018 · 096a5f3 · 096a5f3
1 parent 4eadc88
commit 096a5f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ install:
   - conan user
   - conan remote add ror-dependencies https://api.bintray.com/conan/anotherfoxguy/ror-dependencies || true
   - conan remote add bincrafters-public-conan https://api.bintray.com/conan/bincrafters/public-conan || true
-  - conan install --build=missing -u .
+  - conan install --build=missing -u -s compiler.libcxx=libstdc++11 .
 
 script:
   - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_REDIST_FOLDER=ON .

diff --git a/source/main/CMakeLists.txt b/source/main/CMakeLists.txt
@@ -552,7 +552,7 @@ endif ()
 
 
 # --- Caelum -- Ogre addon for realistic sky rendering ---
-if(DEFINED CONAN_OGRE-CAELUM_ROOT AND WIN32)
+if(DEFINED CONAN_OGRE-CAELUM_ROOT)
     set(CFG_OGRE_PLUGIN_CAELUM "Plugin=Caelum")
     target_include_directories(${BINNAME} PRIVATE CONAN_PKG::ogre-caelum)
     target_link_libraries(${BINNAME} PRIVATE CONAN_PKG::ogre-caelum)