fix cmake files - Linux-compatable include syntax

.gitlab-ci.yml

@@ -21,7 +21,7 @@ stages:          # List of stages for jobs, and their order of execution
   - deploy
 
 .f34-ogl:
-  image: git.fossgalaxy.com:8042/gamedev/containers/fedora:34-opengl
+  image: git.fossgalaxy.com:8042/gamedev/containers/fedora:36-opengl
   before_script:
     - dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\) doxygen
     - dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel bullet-devel

demo/CMakeLists.txt

-#cmake_minimum_required(VERSION 3.16)
-#project(demo)
+cmake_minimum_required(VERSION 3.16)
+project(demo)
 
 # Executable
 add_executable(demo

fggl/CMakeLists.txt

@@ -64,8 +64,12 @@ find_package(yaml-cpp)
 target_link_libraries(fggl PUBLIC yaml-cpp)
 
 # model loading
-find_package(assimp)
-target_link_libraries(${PROJECT_NAME} PUBLIC assimp::assimp)
+find_package(assimp CONFIG)
+if ( MSVC )
+    target_link_libraries(${PROJECT_NAME} PUBLIC assimp::assimp)
+else()
+    target_link_libraries(${PROJECT_NAME} PUBLIC assimp)
+endif()
 
 find_package(Freetype)
 target_link_libraries(${PROJECT_NAME} PUBLIC Freetype::Freetype)

fggl/phys/bullet/CMakeLists.txt

@@ -4,7 +4,17 @@ if ( NOT Bullet_FOUND )
     message(WARNING "Bullet not found - disabling bullet physics integration")
 else()
     message(STATUS "Bullet found")
-    target_link_libraries(fggl PUBLIC LinearMath Bullet3Common BulletCollision BulletDynamics BulletSoftBody )
+
+    if ( MSVC )
+        # see https://github.com/microsoft/vcpkg/issues/7877
+        target_link_libraries(fggl PUBLIC LinearMath Bullet3Common BulletDynamics BulletSoftBody BulletCollision BulletInverseDynamics)
+    else()
+        # FIXME: this shouldn't be necessary, for modern cmake, linking the libraries should be enough
+        target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS})
+        target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIRS})
+        target_link_libraries(fggl PUBLIC ${BULLET_LIBRARIES})
+    endif()
+
 
     # bullet cpp files
     target_sources(fggl