🔨 CMake buildsystem overhaul #2774

AnotherFoxGuy · 2021-08-08T11:20:58Z

Yes, it is that time of the year again to do an overhaul of the cmake buildsystem

Features:

Unified the dependencies in one file, this makes it easier to see what versions are being used
On-demand fallback on Conan ¹
Improved support for building without Conan
Added support for finding dependencies with pkg-config
Removed the pmm cmake-module

¹ Setting the cmake option ROR_LIB_PREFERENCE to SYSTEM will search the system first for dependencies, and then fall back on the Conan package if it hasn't been found

tritonas00 · 2021-08-08T12:51:25Z

git clone --recursive https://github.com/AnotherFoxGuy/rigs-of-rods -b build-sys-V3
cd rigs-of-rods
cmake -DCMAKE_PREFIX_PATH=/home/babis/Downloads/ror-dependencies/Dependencies_Linux/ -DCMAKE_BUILD_TYPE=RelWithDebInfo .

-- The C compiler identification is GNU 11.1.0
-- The CXX compiler identification is GNU 11.1.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Using conan: OFF
-- Found PkgConfig: /usr/bin/pkg-config (found version "1.7.3") 
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - not found
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE  
-- Found OGRE
--   static     : OFF
--   components : Bites;HLMS;MeshLodGenerator;Overlay;Paging;Property;RTShaderSystem;Terrain
--   plugins    : Plugin_CgProgramManager;Plugin_OctreeSceneManager;Plugin_ParticleFX;RenderSystem_GL;Codec_STBI;Codec_FreeImage;Codec_EXR
--   media      : /home/babis/Downloads/ror-dependencies/Dependencies_Linux/share/OGRE/Media
-- Using 'OGRE' system library (Found by find_package)
-- Checking for module 'openal >= 1.18'
--   Found openal , version 1.21.1
-- Using 'OpenAL' system library (Found by pkg_config)
-- Added inteface OpenAL::OpenAL /home/babis/Downloads/ror-dependencies/Dependencies_Linux/include;/home/babis/Downloads/ror-dependencies/Dependencies_Linux/include/AL /home/babis/Downloads/ror-dependencies/Dependencies_Linux/lib/libopenal.so
-- Checking for module 'ois >= 1.4'
--   Package 'ois', required by 'virtual:world', not found
-- Looking for OIS...
-- OIS_PREFIX_PATH changed.
-- Checking for module 'OIS'
--   Package 'OIS', required by 'virtual:world', not found
-- Found OIS: /home/babis/Downloads/ror-dependencies/Dependencies_Linux/lib/libOIS.so
-- Using 'OIS' system library (Found by find_package)
-- Found MyGUI: /home/babis/Downloads/ror-dependencies/Dependencies_Linux/include/MYGUI  
-- Using 'MyGUI' system library (Found by find_package)
-- Checking for module 'socketw >= 3.10'
--   Package 'socketw', required by 'virtual:world', not found
-- Found SocketW: /home/babis/Downloads/ror-dependencies/Dependencies_Linux/include  
-- Using 'SocketW' system library (Found by find_package)
-- Found AngelScript: /home/babis/Downloads/ror-dependencies/Dependencies_Linux/include  
-- Using 'AngelScript' system library (Found by find_package)
-- Checking for module 'libcurl >= 7.6'
--   Found libcurl , version 7.78.0
-- Using 'CURL' system library (Found by pkg_config)
-- Added inteface CURL::libcurl  /usr/lib/libcurl.so
-- Found Caelum: /home/babis/Downloads/ror-dependencies/Dependencies_Linux/include/Caelum  
-- Using 'Caelum' system library (Found by find_package)
-- Could NOT find PagedGeometry (missing: PagedGeometry_INCLUDE_DIRS PagedGeometry_LIBRARIES) 
CMake Error at cmake/DependenciesFunctions.cmake:164 (message):
  Failed to find the system package PagedGeometry
Call Stack (most recent call first):
  cmake/DependenciesConfig.cmake:66 (add_external_lib)
  CMakeLists.txt:111 (include)


-- Configuring incomplete, errors occurred!
See also "/home/babis/Downloads/ror-dependencies/rigs-of-rods/CMakeFiles/CMakeOutput.log".
See also "/home/babis/Downloads/ror-dependencies/rigs-of-rods/CMakeFiles/CMakeError.log"

Did you remove the PagedGeometry submodule?

AnotherFoxGuy · 2021-08-08T13:03:21Z

Did you remove the PagedGeometry submodule?

Yes, PagedGeometry got moved back into its own package since I don't see a benefit to having it vendored

tritonas00 · 2021-08-08T13:07:25Z

Ok then i will re add it in ror-dependencies.

tritonas00 · 2021-08-08T13:46:52Z

OK i added it RigsOfRods/ror-dependencies#51 but now i get

CMake Error at cmake/DependenciesFunctions.cmake:164 (message):
  Failed to find the system package discord_rpc
Call Stack (most recent call first):
  cmake/DependenciesConfig.cmake:81 (add_external_lib)
  CMakeLists.txt:111 (include)

Shouldn't this be optional? -DUSE_DISCORD_RPC=OFF doesn't work

AnotherFoxGuy · 2021-08-08T14:01:04Z

It is optional, the option to disable it is now called ROR_USE_DISCORD_RPC
(All the dependencies options are now grouped under ROR_USE_*)

tritonas00 · 2021-08-08T14:09:27Z

OK compiled, but it ended up with wrong plugins.cfg

It should be

PluginFolder=/home/babis/Downloads/ror-dependencies/Dependencies_Linux/lib/OGRE

but it was

PluginFolder=.

And caelum plugin line missing

Should be

Plugin=../libCaelum.so

After those, everything works fine.

AnotherFoxGuy · 2021-08-08T15:21:13Z

And caelum plugin line missing

That is because paroj dropped the Plugin API
OGRECave/ogre-caelum@70bebc7

tritonas00 · 2021-08-09T12:41:16Z

And caelum plugin line missing

That is because paroj dropped the Plugin API
OGRECave/ogre-caelum@70bebc7

Thats an issue then, user ends up with this:

Please re add the libCaelum.so plugin lines, it worked fine so far

AnotherFoxGuy · 2021-09-02T12:22:03Z

Please re add the libCaelum.so plugin lines, it worked fine so far

This should be fixed now, could you test this PR again?

tritonas00 · 2021-09-03T13:40:38Z

Works fine now. I would wait a bit until Petr finishes his work for the release, then merge.

ohlidalp · 2021-09-28T10:06:00Z

I'm getting

ERROR: Unable to find 'ogre3d-pagedgeometry/1.2.1@anotherfoxguy/stable' in remotes

What I did:

Update: conan >> 1.40.2, cmake >> 3.21.3, visual studio >> 16.11.3
conan remove -f *
conan remote clean
conan remote add conancenter https://center.conan.io
rmdir /S /Q "C:\Users\Petr\builds\rigs-of-rods"
cmake -S "C:\Users\Petr\source\rigs-of-rods" -B "C:\Users\Petr\builds\rigs-of-rods" -G "Visual Studio 16 2019" -A "x64"

Update: same result after uninstalling conan, removing '.conan' dir and installing conan.

AnotherFoxGuy · 2021-09-28T11:32:54Z

@only-a-ptr That issue should be fixed now, I changed the ogre3d-* conan package versions to the correct versions

ohlidalp

Builds and runs fine.

tritonas00 · 2021-09-28T14:40:41Z

@AnotherFoxGuy

Tried with conan also on Arch, builds fine but i had to manually install freeimage because:

./RoR: error while loading shared libraries: libfreeimage.so.3: cannot open shared object file: No such file or directory

after installed it runs fine.

There is

/rigs-of-rods/bin/libfreeimage-3.18.0.so

but why RoR asks for the system one?

EDIT

If i make a libfreeimage.so.3 symlink of libfreeimage-3.18.0.so it works

Also caelum doesn't work correctly (check the time slider, for some reason it goes by steps with conan, it should float)
With ror-dependencies

With conan

Happens on gh action build of this PR also, master branch doesn't have the issue.

ohlidalp · 2021-09-28T16:29:12Z

I also have an issue with the Caelum daytime slider - it moves in 5 discrete steps instead of smoothly.

~~Another oddity I observed is that each tab in the Settings UI now displays a tooltip with it's name.~~ Correction: also happens on master, I just didn't notice.

tritonas00

To clarify the caelum issue:

It doesn't happen on master (neither conan or ror-dependencies)
It doesn't happen with this PR and ror-dependencies
It happens with this PR and conan

tritonas00 · 2021-10-06T17:50:09Z

Works fine now:

ohlidalp

Works just fine.

ENVIRONMENT:
Windows 10 Pro, version 20H2, build 19042.1237
Microsoft Visual Studio Community 2019 Version 16.11.3
conan 1.41.0
cmake v3.21.3
NVIDIA GeForce GTX 660, driver 27.21.14.6627

STEPS:
PS C:\Windows\system32> conan remove -f *
PS C:\Windows\system32> conan remote clean
PS C:\Windows\system32> conan remote add conancenter https://center.conan.io
rmdir /S /Q "%USERPROFILE%\builds\rigs-of-rods"
cmake -S "%USERPROFILE%\source\rigs-of-rods" -B "%USERPROFILE%\builds\rigs-of-rods" -G "Visual Studio 16 2019" -A "x64"

AnotherFoxGuy requested review from ohlidalp and tritonas00 August 8, 2021 11:21

AnotherFoxGuy force-pushed the build-sys-V3 branch 2 times, most recently from cbf0442 to c8b7d3e Compare August 23, 2021 14:15

AnotherFoxGuy force-pushed the build-sys-V3 branch 3 times, most recently from ef79c2f to 77b86d1 Compare September 2, 2021 11:33

tritonas00 approved these changes Sep 3, 2021

View reviewed changes

AnotherFoxGuy force-pushed the build-sys-V3 branch 2 times, most recently from 7a45fee to 1ca2fba Compare September 9, 2021 12:15

AnotherFoxGuy force-pushed the build-sys-V3 branch 2 times, most recently from f9ac250 to f284489 Compare September 20, 2021 13:44

AnotherFoxGuy force-pushed the build-sys-V3 branch from f284489 to b6524c5 Compare September 28, 2021 11:21

ohlidalp approved these changes Sep 28, 2021

View reviewed changes

tritonas00 self-requested a review September 28, 2021 16:38

tritonas00 requested changes Sep 28, 2021

View reviewed changes

tritonas00 self-requested a review October 7, 2021 08:53

tritonas00 approved these changes Oct 7, 2021

View reviewed changes

ohlidalp self-requested a review October 7, 2021 09:57

ohlidalp approved these changes Oct 7, 2021

View reviewed changes

AnotherFoxGuy force-pushed the build-sys-V3 branch from 5ca2eba to 21ee5e1 Compare October 12, 2021 12:44

AnotherFoxGuy mentioned this pull request Oct 23, 2021

🚀 Added support for building with conan stuntrally/stuntrally#39

Merged

2 tasks

AnotherFoxGuy force-pushed the build-sys-V3 branch from 21ee5e1 to 8d20abc Compare October 29, 2021 09:25

AnotherFoxGuy force-pushed the build-sys-V3 branch 3 times, most recently from dc8c9d1 to 8cc983d Compare November 28, 2021 11:18

AnotherFoxGuy force-pushed the build-sys-V3 branch from 8cc983d to fde18cb Compare November 28, 2021 11:28

AnotherFoxGuy added 15 commits December 3, 2021 10:14

🔨 Refactored cmake build system

4c9a3a9

🔧 Made PagedGeometry optional again

19b9906

🐛 Fixed build without conan

5815b93

🔥 Removed conanfile

889bd4c

🐛 Fixed build without conan on windows

69096d2

🔨 Added support for finding deps with pkg config

8f367a0

🐛 Fixed cmake erroring when a optional package wasn't found

f7ad8d0

🐛 Fixed OGRE plugins dir

6c0b76c

🐛 Fixed missing Caelum plugin

2d68ba6

🚀 Added more headers to pch.h

9cb3b75

🐛 Fixed cmake not finding conan deps with a different package name

5e1a42c

📝 Updated BUILDING.md

007efdf

🔧 Updated ogre3d package versions

34775d2

🐛 Fixed broken Caelum package

e819bdd

🐛 Fixed build with VS 2022

bfc6546

AnotherFoxGuy force-pushed the build-sys-V3 branch from fde18cb to bfc6546 Compare December 3, 2021 09:15

AnotherFoxGuy merged commit 73b1785 into RigsOfRods:master Dec 3, 2021

AnotherFoxGuy deleted the build-sys-V3 branch December 3, 2021 22:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🔨 CMake buildsystem overhaul #2774

🔨 CMake buildsystem overhaul #2774

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 8, 2021 •

edited

Loading

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 8, 2021

tritonas00 commented Aug 8, 2021 •

edited

Loading

AnotherFoxGuy commented Aug 8, 2021 •

edited

Loading

tritonas00 commented Aug 8, 2021 •

edited

Loading

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 9, 2021 •

edited

Loading

AnotherFoxGuy commented Sep 2, 2021

tritonas00 commented Sep 3, 2021

ohlidalp commented Sep 28, 2021 •

edited

Loading

AnotherFoxGuy commented Sep 28, 2021

ohlidalp left a comment

tritonas00 commented Sep 28, 2021 •

edited

Loading

ohlidalp commented Sep 28, 2021 •

edited

Loading

tritonas00 left a comment

tritonas00 commented Oct 6, 2021

ohlidalp left a comment

🔨 CMake buildsystem overhaul #2774

🔨 CMake buildsystem overhaul #2774

Conversation

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 8, 2021 • edited Loading

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 8, 2021

tritonas00 commented Aug 8, 2021 • edited Loading

AnotherFoxGuy commented Aug 8, 2021 • edited Loading

tritonas00 commented Aug 8, 2021 • edited Loading

AnotherFoxGuy commented Aug 8, 2021

tritonas00 commented Aug 9, 2021 • edited Loading

AnotherFoxGuy commented Sep 2, 2021

tritonas00 commented Sep 3, 2021

ohlidalp commented Sep 28, 2021 • edited Loading

AnotherFoxGuy commented Sep 28, 2021

ohlidalp left a comment

Choose a reason for hiding this comment

tritonas00 commented Sep 28, 2021 • edited Loading

ohlidalp commented Sep 28, 2021 • edited Loading

tritonas00 left a comment

Choose a reason for hiding this comment

tritonas00 commented Oct 6, 2021

ohlidalp left a comment

Choose a reason for hiding this comment

tritonas00 commented Aug 8, 2021 •

edited

Loading

tritonas00 commented Aug 8, 2021 •

edited

Loading

AnotherFoxGuy commented Aug 8, 2021 •

edited

Loading

tritonas00 commented Aug 8, 2021 •

edited

Loading

tritonas00 commented Aug 9, 2021 •

edited

Loading

ohlidalp commented Sep 28, 2021 •

edited

Loading

tritonas00 commented Sep 28, 2021 •

edited

Loading

ohlidalp commented Sep 28, 2021 •

edited

Loading