Merge pull request #56391 from matthewbauer/cmake-treewide

Add more CMake flags
This commit is contained in:
Matthew Bauer
2019-03-11 12:43:46 -04:00
committed by GitHub
20 changed files with 14 additions and 30 deletions
@@ -71,6 +71,11 @@ cmakeConfigurePhase() {
cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"
# Dont build tests when doCheck = false
if [ -z "$doCheck" ]; then
cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
fi
# Avoid cmake resetting the rpath of binaries, on make install
# And build always Release, to ensure optimisation flags
cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"