Fix #198 and #199 broken cmake popt detection and use /bin/sh not /bin/bash. #200
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
This fixes the cmake popt detection on (at least) FreeBSD. It mostly worked by accident on other platforms like Debian because of standardized install locations aligning with our miss-used output vars. In CMakeLists.txt bump cmake_minimum_required to 3.6 for a working version of pkg_search_module() with IMPORTED_TARGET support. The version on our travis xenial test platform is 3.12.4, so 3.6 is rather old. Fix BZIP2 detection to use the correct BZIP2_INCLUDE_DIRS var. Add POPT status messages to match other find_package() handling. Remove redundant "Found..." messages from all find_package() handling. In cmake/FindPOPT.cmake use pkg_search_module() IMPORTED_TARGET support to create a PkgConfig::POPT target and use it, following instructions found here; https://stackoverflow.com/questions/29191855/what-is-the-proper-way-to-use-pkg-config-from-cmake Follow a pattern from official FindPackage modules of using cached vars POPT_LIBRARY_RELEASE/POPT_IMPORT_DIR to set uncached vars POPT_LIBRARIES/POPT_IMPORT_DIRS. This makes it behave almost exactly like offical FindPackage modules. In cmake/Findlibb2.cmake update it to also use the more standard cached/uncached vars pattern.
This fixes testing on FreeBSD, which doesn't install bash by default, and even when it does, it puts it in a /usr/local/bin.
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.
This should fix problems on FreeBSD with cmake's popt detection and running tests without needing /bin/bash.
This fixes our cmake/FindPOPT.cmake by copying official FindPackage() examples and following the instructions for correctly using PkgConfig found here;
https://stackoverflow.com/questions/29191855/what-is-the-proper-way-to-use-pkg-config-from-cmake
It also updates cmake/Findlibb2.cmake to follow best practices better, and cleans our FindPackage() handling in CMakeLists.txt.
Finally, it fixes the only test script we had using
#!/bin/bashto use#!/bin/shinstead. Apparently FreeBSD doesn't have bash installed by default, and this script doesn't need bash anyway.