Dev libjpeg fix #201
Open
Dev libjpeg fix #201
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for issue ValveSoftware#191 (https://github.com/ValveSoftware/vogl/). (1) Fails when libjpegturbo is not found. (2) Adds a check for the header file turbojpeg.h
(1) removed check for tinyxml;
(2) added check for tinyxml2;
(3) added better build routine if tinyxml2 is not found;
CMakeLists.txt:
- Removed find_package(TinyXML) call;
New cmake module: src/cmake/Modules/FindTinyXML2.cmake
src/voglgen/CMakeLists.txt:
- Removed file (GLOB_RECURSE) - this appears to only find tinyxml2.h
- find_package(TinyXML2) - use the library currently installed on the system
otherwise it will be compiled
- reworked the build process
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some build update and fixes:
(1) libjpegturbo is not found; issue #191 adds a check for the header file;
(3) voglgen build updates