Fixed GTest find command and re-enabled tests.#10
Open
LinusVanElswijk wants to merge 71 commits intoandre-schulz:cmakefrom
Open
Fixed GTest find command and re-enabled tests.#10LinusVanElswijk wants to merge 71 commits intoandre-schulz:cmakefrom
LinusVanElswijk wants to merge 71 commits intoandre-schulz:cmakefrom
Conversation
- libpng 1.6.10 -> 1.6.17 - glew 1.10 -> 1.12
- Somehow Qt5's configure terminates the shell it runs in and thus the BUILD_COMMAND is not executed
Required by apps/umve/viewinspect/imageoperations.cc
This changes the location of Qt5 to a saner location. Remove the old location from the CMAKE_PREFIX_PATH in the top-level CMakeLists.txt.
zlib should be found automatically without explicit setting of ZLIB_ROOT.
The dependencies which use CMake can be built out-of-source so the BUILD_IN_SOURCE option is not needed for these projects.
- Updated CMake minimum version from 3.0 to 3.7 because the glew external
project makes use of SOURCE_SUBDIR which was introduced in CMake 3.7
- Update libpng from 1.6.21 to 1.6.29
- Reduced download size by downloading a .7z archive instead of a .zip
- Update zlib from 1.2.8 to 1.2.11
- Reduced download size by downloading a .tar.xz archive instead of .zip
- Update libtiff from 4.0.4 to 4.0.8
- Update glew from 1.12.0 to 2.0.0
- Reduce download size by downloading a .tgz archive instead of .zip
- Now using glew's CMake build system because it makes things easier and
we longer need "patches/glew.rc".
- Remove setting of GLEW_STATIC because we now link against a shared version
of glew
- Update gtest from 1.7.0 to 1.8.0
- Reduced download size by downloading a .tar.gz archive instead of .zip
- Removed install commands and BUILD_IN_SOURCE option because gtest 1.8.0
finally uses install()
Somehow I lost this patch while working on the cmake branch. Thanks to @LinusVanElswijk for fixing this in PR simonfuhrmann#8.
Only 64-bit builds are supported for MVE
- VS_{CONFIG, PLATFORM, PLATFORM_TOOLSET} are no longer needed for glew because
we're using its CMake build system.
- Add some sanity checks regarding operating system, compiler and architecture
MSVC_VERSION works with all Visual Studio versions.
This replaces the OpenMP install hack with a saner standardized solution from CMake. The CMAKE_INSTALL_OPENMP_LIBRARIES variable exists since CMake 3.1.
Owner
|
Hi @LinusVanElswijk, |
Owner
|
Hi @LinusVanElswijk, |
andre-schulz
force-pushed
the
cmake
branch
2 times, most recently
from
8a3ffb4 to
3367427
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
CMake could not find GTest, because of a small typo in the CMakeFile ("Gtest" instead of "GTest").
This commit fixes that and adds the 'tests' subdirectory back into to the project.
(It was commented out before).
If GTest cannot be found, the test subdirectory is automatically skipped.