🐛 Fixed broken Caelum package

RigsOfRods · Oct 12, 2021 · 21ee5e1 · 21ee5e1
1 parent 273d7ed
commit 21ee5e1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/build-game.yml b/.github/workflows/build-game.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Cache conan
         uses: actions/cache@v2.1.6
         with:
-          key: conan-root-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
+          key: conan-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
           path: ~/.conan/
 
       - name: Install dependencies
@@ -97,7 +97,7 @@ jobs:
       - name: Cache conan packages
         uses: actions/cache@v2.1.6
         with:
-          key: conan-root-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
+          key: conan-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
           path: ~/.conan
 
       - name: Enable Developer Command Prompt

diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake
@@ -61,7 +61,8 @@ add_external_lib(
 
 add_external_lib(
         Caelum
-        ogre3d-caelum/0.6.3@anotherfoxguy/stable
+        # Temporary switch back to the rigs of rods version, since the OGRE version is broken
+        ogre3d-caelum/0.6.3@rigs-of-rods/stable
         # PKG_CONFIG "Caelum >= 0.6.3"
         CONAN_PKG_NAME Caelum
         FIND_PACKAGE

diff --git a/source/main/CMakeLists.txt b/source/main/CMakeLists.txt
@@ -461,9 +461,17 @@ else ()
     set(PLUGINS_FOLDER ".")
 endif ()
 
-if (${_PREFIX}USE_CAELUM STREQUAL "SYSTEM")
-    set(CFG_OGRE_PLUGIN_CAELUM "Plugin=../libCaelum.so")
-    set(CFG_OGRE_PLUGIN_CAELUM_D "Plugin=../libCaelum_d.so")
+if (WIN32)
+    set(CFG_OGRE_PLUGIN_CAELUM "Plugin=Caelum")
+    set(CFG_OGRE_PLUGIN_CAELUM_D "Plugin=Caelum")
+else ()
+    if (${_PREFIX}USE_CAELUM STREQUAL "SYSTEM")
+        set(CFG_OGRE_PLUGIN_CAELUM "Plugin=../libCaelum.so")
+        set(CFG_OGRE_PLUGIN_CAELUM_D "Plugin=../libCaelum_d.so")
+    else ()
+        set(CFG_OGRE_PLUGIN_CAELUM "Plugin=libCaelum.so")
+        set(CFG_OGRE_PLUGIN_CAELUM_D "Plugin=libCaelum_d.so")
+    endif ()
 endif ()
 
 configure_file(plugins.cfg.in ${RUNTIME_OUTPUT_DIRECTORY}/plugins.cfg)