diff --git a/CMakeLists.txt b/CMakeLists.txt index ccb9c84eff12d68373d52064555e4f332a223734..248955335ac661417304c41a988c3359700e3213 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \ never or list of libs to build") option(OGS_DISABLE_CCACHE "Disables ccache compiler cache." OFF) if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.16) - option(OGS_USE_UNITY_BUILDS "Enables Unity builds for faster compilation." OFF) + option(OGS_USE_UNITY_BUILDS "Enables Unity builds for faster compilation." ON) endif() # Third-party libraries, names come from Conan package names diff --git a/Jenkinsfile b/Jenkinsfile index 5df19b3dc93404d46e827703d40b5996a6574f15..1ec41a864aab210dcae03aa843a8e8cac24e1458 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,7 +116,6 @@ pipeline { '-DOGS_USE_CVODE=ON ' + '-DOGS_USE_MFRONT=ON ' + '-DOGS_USE_PYTHON=ON ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' } // Workaround some MGIS CMake logic flaws @@ -204,7 +203,6 @@ pipeline { '-DOGS_CONAN_BUILD=missing ' + '-DOGS_BUILD_TESTS=OFF ' + '-DOGS_USE_NETCDF=ON ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' } build { @@ -262,7 +260,6 @@ pipeline { '-DOGS_CONAN_BUILD=missing ' + '-DOGS_CONAN_BUILD_TYPE=Release ' + '-DOGS_CPU_ARCHITECTURE=generic ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' config = 'Debug' } @@ -297,7 +294,6 @@ pipeline { '-DOGS_CPU_ARCHITECTURE=sandybridge ' + '-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/standard ' + '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/standard ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + // no effect as cmake too old '-DOGS_USE_PCH=OFF ' env = 'eve/cli.sh' } @@ -355,7 +351,6 @@ pipeline { '-DOGS_CPU_ARCHITECTURE=sandybridge ' + '-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/petsc ' + '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/petsc ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + // no effect as cmake too old '-DOGS_USE_PCH=OFF ' env = 'eve/petsc.sh' } @@ -420,7 +415,6 @@ pipeline { '-DOGS_CONAN_BUILD=missing ' + '-DOGS_BUILD_SWMM=ON ' + '-DOGS_USE_NETCDF=ON ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' } build { @@ -477,7 +471,6 @@ pipeline { '-DOGS_BUILD_UTILS=ON ' + '-DOGS_CONAN_BUILD=missing ' + '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' } build { @@ -527,7 +520,6 @@ pipeline { '-DOGS_USE_CONAN=OFF ' + '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' + '-DOGS_USE_NETCDF=ON ' + - '-DOGS_USE_UNITY_BUILDS=ON ' + '-DOGS_USE_PCH=OFF ' } build {