Skip to content

Make FindBasisUniversal search libraries instead of pkgconfig - #72

Merged
mosra merged 1 commit into
mosra:masterfrom
Squareys:fix-basis-findmodule
Nov 6, 2019
Merged

mosra merged 1 commit into
mosra:masterfrom
Squareys:fix-basis-findmodule

Conversation

@Squareys

Copy link
Copy Markdown
Contributor

Hi @mosra !

As promised, here's a version of the FindBasisUniversal that works with vcpkg.
I have a maybe unconventional use of find_package_handle_standard_args in there for setting the BasisUniversal_(Encoder|Transcoder_FOUND vars. It causes output when both are found and I'm interested in your judgment whether that is a good trade-off for the more concise code.

Best,
Jonathan

@mosra mosra left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for not replying earlier.

Comment thread modules/FindBasisUniversal.cmake Outdated
Comment thread modules/FindBasisUniversal.cmake Outdated
Comment thread modules/FindBasisUniversal.cmake Outdated
@mosra mosra added this to the 2019.1c milestone Nov 3, 2019
@Squareys
Squareys force-pushed the fix-basis-findmodule branch 2 times, most recently from 2d8e018 to 00fc530 Compare November 6, 2019 14:46
@codecov-io

codecov-io commented Nov 6, 2019 •

Copy link
Copy Markdown

Codecov Report

Merging #72 into master will increase coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #72      +/-   ##
==========================================
+ Coverage      91%   91.15%   +0.15%     
==========================================
  Files          53       53              
  Lines        4480     4025     -455     
==========================================
- Hits         4077     3669     -408     
+ Misses        403      356      -47
Impacted Files Coverage Δ
...rc/MagnumPlugins/AssimpImporter/AssimpImporter.cpp 83.33% <0%> (-3.17%) ⬇️
src/Magnum/OpenDdl/Document.h 88.57% <0%> (-0.32%) ⬇️
...lugins/BasisImageConverter/BasisImageConverter.cpp 91% <0%> (-0.09%) ⬇️
src/MagnumPlugins/FreeTypeFont/FreeTypeFont.cpp 98.73% <0%> (-0.07%) ⬇️
src/Magnum/OpenDdl/Structure.h 96.49% <0%> (-0.07%) ⬇️
src/MagnumPlugins/DdsImporter/DdsImporter.cpp 77.95% <0%> (-0.04%) ⬇️
src/MagnumPlugins/OpenGexImporter/openGexSpec.hpp 100% <0%> (ø) ⬆️
.../MagnumPlugins/OpenGexImporter/OpenGexImporter.cpp 96.2% <0%> (+0.48%) ⬆️
...agnumPlugins/StanfordImporter/StanfordImporter.cpp 94.38% <0%> (+0.63%) ⬆️
src/Magnum/OpenDdl/Implementation/Parsers.cpp 88.13% <0%> (+0.66%) ⬆️
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b48f9bd...b0b12ff. Read the comment docs.

@Squareys
Squareys force-pushed the fix-basis-findmodule branch from 00fc530 to b0b12ff Compare November 6, 2019 16:42

@mosra mosra left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i feel like i'm repeating myself a bit too much 😅

Comment thread modules/FindBasisUniversal.cmake Outdated
Comment thread modules/FindBasisUniversal.cmake Outdated
Comment thread modules/FindBasisUniversal.cmake Outdated
Signed-off-by: Squareys <squareys@googlemail.com>
@Squareys
Squareys force-pushed the fix-basis-findmodule branch from b0b12ff to c2a0546 Compare November 6, 2019 17:47
@mosra
mosra merged commit c2a0546 into mosra:master Nov 6, 2019
@mosra

mosra commented Nov 6, 2019

Copy link
Copy Markdown
Owner

All my local tests worked, so merged, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

3 participants