Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Onuralp SEZER
Game Library
Commits
8b173ba3
Commit
8b173ba3
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
attempt to work around debian packging differences
parent
9ea9a725
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fggl/audio/openal/CMakeLists.txt
+13
-6
13 additions, 6 deletions
fggl/audio/openal/CMakeLists.txt
fggl/phys/bullet/CMakeLists.txt
+2
-1
2 additions, 1 deletion
fggl/phys/bullet/CMakeLists.txt
with
15 additions
and
7 deletions
fggl/audio/openal/CMakeLists.txt
+
13
−
6
View file @
8b173ba3
find_package
(
OpenAL CONFIG
)
if
(
NOT OpenAL_FOUND
)
# ubuntu openal-soft package doesn't seem to have a config file
# ubuntu/debian openal-soft package doesn't seem to have a config file
# it's probably falling back to findOpenAL.cmake
message
(
STATUS
"Using OpenAL-Soft config missing - falling back"
)
find_package
(
OpenAL REQUIRED
)
endif
()
if
(
TARGET OpenAL::OpenAL
)
target_link_libraries
(
fggl PUBLIC OpenAL::OpenAL
)
target_link_libraries
(
fggl public
${
OPENAL_LIBRARY
}
)
target_include_directories
(
fggl public
${
OPENAL_INCLUDE_DIR
}
)
else
()
target_link_libraries
(
fggl PUBLIC OpenAL
)
# we're using target-based
message
(
STATUS
"Using OpenAL-Soft config file"
)
if
(
TARGET OpenAL::OpenAL
)
target_link_libraries
(
fggl PUBLIC OpenAL::OpenAL
)
else
()
target_link_libraries
(
fggl PUBLIC OpenAL
)
endif
()
endif
()
target_sources
(
fggl
...
...
This diff is collapsed.
Click to expand it.
fggl/phys/bullet/CMakeLists.txt
+
2
−
1
View file @
8b173ba3
...
...
@@ -3,7 +3,7 @@ find_package( Bullet CONFIG )
if
(
NOT Bullet_FOUND
)
message
(
WARNING
"Bullet not found - disabling bullet physics integration"
)
else
()
message
(
STATUS
"Bullet
found"
)
message
(
STATUS
"Bullet
is poorly packaged, you might need to disable support for it"
)
if
(
MSVC
)
# see https://github.com/microsoft/vcpkg/issues/7877
...
...
@@ -13,6 +13,7 @@ else()
target_compile_definitions
(
fggl PUBLIC
${
BULLET_DEFINITIONS
}
)
if
(
BULLET_INCLUDE_DIRS STREQUAL
"include/bullet"
)
message
(
STATUS
"Bullet include path is relative - hard-coding"
)
# FIXME possible debian packing bug: path is relative in BulletConfig.cmake
# FIXME debian packaging bug: BulletConfig.cmake lists BulletInverseDynamics, but that's packaged in bullet-extras
target_include_directories
(
fggl PUBLIC
${
BULLET_ROOT_DIR
}
/
${
BULLET_INCLUDE_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment