mirror of
https://github.com/OPM/ResInsight.git
synced 2024-12-29 10:21:54 -06:00
Add prefix to cmake options
Add missing RESINSIGHT_ prefix to cmake options GHA: Fix warnings
This commit is contained in:
parent
95e3435384
commit
f4dd1d363d
4
.github/workflows/AppFwkUnitTest.yml
vendored
4
.github/workflows/AppFwkUnitTest.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Set apt mirror
|
- name: Set apt mirror
|
||||||
# see https://github.com/actions/runner-images/issues/7048
|
# see https://github.com/actions/runner-images/issues/7048
|
||||||
if: "contains( matrix.os, 'ubuntu')"
|
if: ${{contains( matrix.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
# make sure there is a `\t` between URL and `priority:*` attributes
|
# make sure there is a `\t` between URL and `priority:*` attributes
|
||||||
printf 'http://azure.archive.ubuntu.com/ubuntu priority:1\n' | sudo tee /etc/apt/mirrors.txt
|
printf 'http://azure.archive.ubuntu.com/ubuntu priority:1\n' | sudo tee /etc/apt/mirrors.txt
|
||||||
@ -22,7 +22,7 @@ jobs:
|
|||||||
sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list
|
sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list
|
||||||
|
|
||||||
- name: Install Linux dependencies
|
- name: Install Linux dependencies
|
||||||
if: "contains( matrix.os, 'ubuntu')"
|
if: ${{contains( matrix.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update --option="APT::Acquire::Retries=3"
|
sudo apt-get update --option="APT::Acquire::Retries=3"
|
||||||
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
|
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
|
||||||
|
14
.github/workflows/ResInsightWithCache.yml
vendored
14
.github/workflows/ResInsightWithCache.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
schedule:
|
schedule:
|
||||||
# Every day at 1am to make sure we have a build cache for the current date
|
# Every day at 1am to make sure we have a build cache for the current date
|
||||||
# build cache is
|
# build cache is
|
||||||
- cron: "0 1 * * * "
|
- cron: '0 1 * * *'
|
||||||
env:
|
env:
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
BUILDCACHE_VERSION: 0.27.6
|
BUILDCACHE_VERSION: 0.27.6
|
||||||
@ -137,7 +137,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Set apt mirror
|
- name: Set apt mirror
|
||||||
# see https://github.com/actions/runner-images/issues/7048
|
# see https://github.com/actions/runner-images/issues/7048
|
||||||
if: "contains( matrix.config.os, 'ubuntu')"
|
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
# make sure there is a `\t` between URL and `priority:*` attributes
|
# make sure there is a `\t` between URL and `priority:*` attributes
|
||||||
printf 'http://azure.archive.ubuntu.com/ubuntu priority:1\n' | sudo tee /etc/apt/mirrors.txt
|
printf 'http://azure.archive.ubuntu.com/ubuntu priority:1\n' | sudo tee /etc/apt/mirrors.txt
|
||||||
@ -145,7 +145,7 @@ jobs:
|
|||||||
sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list
|
sudo sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/mirrors.txt/' /etc/apt/sources.list
|
||||||
|
|
||||||
- name: Install Linux dependencies
|
- name: Install Linux dependencies
|
||||||
if: "contains( matrix.config.os, 'ubuntu')"
|
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update --option="APT::Acquire::Retries=3"
|
sudo apt-get update --option="APT::Acquire::Retries=3"
|
||||||
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
||||||
@ -168,14 +168,14 @@ jobs:
|
|||||||
appendedCacheKey: ${{ matrix.config.os }}-${{ matrix.config.cxx }}-cache-key-v2
|
appendedCacheKey: ${{ matrix.config.os }}-${{ matrix.config.cxx }}-cache-key-v2
|
||||||
|
|
||||||
- name: Cache dynamic version of OpenSSL (Linux)
|
- name: Cache dynamic version of OpenSSL (Linux)
|
||||||
if: "contains( matrix.config.os, 'ubuntu_disabled')"
|
if: ${{contains( matrix.config.os, 'ubuntu_disabled') }}
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
|
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
|
||||||
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v05
|
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v05
|
||||||
|
|
||||||
- name: Install dynamic version of OpenSSL (Linux)
|
- name: Install dynamic version of OpenSSL (Linux)
|
||||||
if: "contains( matrix.config.os, 'ubuntu')"
|
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
$VCPKG_ROOT/vcpkg install --overlay-triplets=${{ github.workspace }}/ThirdParty/vcpkg-custom-triplets --triplet x64-linux-dynamic openssl
|
$VCPKG_ROOT/vcpkg install --overlay-triplets=${{ github.workspace }}/ThirdParty/vcpkg-custom-triplets --triplet x64-linux-dynamic openssl
|
||||||
|
|
||||||
@ -222,13 +222,13 @@ jobs:
|
|||||||
- name: Stats for buildcache
|
- name: Stats for buildcache
|
||||||
run: ${{ github.workspace }}/buildcache/bin/buildcache -s
|
run: ${{ github.workspace }}/buildcache/bin/buildcache -s
|
||||||
- name: Run Unit Tests
|
- name: Run Unit Tests
|
||||||
if: "matrix.config.execute-unit-tests == true"
|
if: matrix.config.execute-unit-tests == 'true'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cmakebuild/ApplicationExeCode/ResInsight --unittest
|
cmakebuild/ApplicationExeCode/ResInsight --unittest
|
||||||
|
|
||||||
- name: Run pytest
|
- name: Run pytest
|
||||||
if: "matrix.config.build-python-module == true"
|
if: matrix.config.build-python-module == 'true'
|
||||||
env:
|
env:
|
||||||
RESINSIGHT_EXECUTABLE: ${{ runner.workspace }}/ResInsight/cmakebuild/ApplicationExeCode/ResInsight
|
RESINSIGHT_EXECUTABLE: ${{ runner.workspace }}/ResInsight/cmakebuild/ApplicationExeCode/ResInsight
|
||||||
run: |
|
run: |
|
||||||
|
4
.github/workflows/clang-tidy.yml
vendored
4
.github/workflows/clang-tidy.yml
vendored
@ -7,7 +7,7 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
# Once every night
|
# Once every night
|
||||||
- cron: "0 1 * * * "
|
- cron: "0 1 * * *"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ResInsight-x64-buildcache:
|
ResInsight-x64-buildcache:
|
||||||
@ -33,7 +33,7 @@ jobs:
|
|||||||
submodules: true
|
submodules: true
|
||||||
|
|
||||||
- name: Install Linux dependencies
|
- name: Install Linux dependencies
|
||||||
if: "contains( matrix.config.os, 'ubuntu')"
|
if: ${{contains( matrix.config.os, 'ubuntu') }}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update --option="APT::Acquire::Retries=3"
|
sudo apt-get update --option="APT::Acquire::Retries=3"
|
||||||
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
sudo apt-get install --option="APT::Acquire::Retries=3" libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
||||||
|
@ -74,7 +74,7 @@ endif()
|
|||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
# Eigen
|
# Eigen
|
||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
if(VCPKG_AUTO_INSTALL)
|
if(RESINSIGHT_VCPKG_AUTO_INSTALL)
|
||||||
vcpkg_install(eigen3)
|
vcpkg_install(eigen3)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
|||||||
|
|
||||||
option(RESINSIGHT_BUNDLE_TESTMODELS "Copy TestModels into the installation" OFF)
|
option(RESINSIGHT_BUNDLE_TESTMODELS "Copy TestModels into the installation" OFF)
|
||||||
|
|
||||||
option(VCPKG_AUTO_INSTALL
|
option(RESINSIGHT_VCPKG_AUTO_INSTALL
|
||||||
"Automatically download build pre-requisites with VCPKG" OFF
|
"Automatically download build pre-requisites with VCPKG" OFF
|
||||||
)
|
)
|
||||||
if(VCPKG_AUTO_INSTALL)
|
if(RESINSIGHT_VCPKG_AUTO_INSTALL)
|
||||||
include(AutoVcpkg)
|
include(AutoVcpkg)
|
||||||
set(AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")
|
set(AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")
|
||||||
endif()
|
endif()
|
||||||
@ -321,8 +321,8 @@ set(CMAKE_CXX_COMPILER_LAUNCHER ${TEMP_CMAKE_CXX_COMPILER_LAUNCHER})
|
|||||||
find_package(Git QUIET)
|
find_package(Git QUIET)
|
||||||
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
|
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
|
||||||
# Update submodules as needed
|
# Update submodules as needed
|
||||||
option(GIT_SUBMODULE "Check submodules during build" ON)
|
option(RESINSIGHT_UPDATE_SUBMODULES "Check submodules during build" ON)
|
||||||
if(GIT_SUBMODULE)
|
if(RESINSIGHT_UPDATE_SUBMODULES)
|
||||||
set(SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty")
|
set(SUBDIR "${PROJECT_SOURCE_DIR}/ThirdParty")
|
||||||
message(STATUS "Initializing GIT submodules")
|
message(STATUS "Initializing GIT submodules")
|
||||||
execute_process(
|
execute_process(
|
||||||
@ -424,7 +424,7 @@ endif() # MSVC
|
|||||||
# Opm
|
# Opm
|
||||||
# ##############################################################################
|
# ##############################################################################
|
||||||
|
|
||||||
if(VCPKG_AUTO_INSTALL)
|
if(RESINSIGHT_VCPKG_AUTO_INSTALL)
|
||||||
vcpkg_install(boost-filesystem)
|
vcpkg_install(boost-filesystem)
|
||||||
vcpkg_install(boost-spirit)
|
vcpkg_install(boost-spirit)
|
||||||
include(${CMAKE_TOOLCHAIN_FILE})
|
include(${CMAKE_TOOLCHAIN_FILE})
|
||||||
|
@ -3,7 +3,7 @@ project(GrpcInterface)
|
|||||||
message(STATUS "GRPC enabled")
|
message(STATUS "GRPC enabled")
|
||||||
add_definitions(-DENABLE_GRPC)
|
add_definitions(-DENABLE_GRPC)
|
||||||
|
|
||||||
if(VCPKG_AUTO_INSTALL)
|
if(RESINSIGHT_VCPKG_AUTO_INSTALL)
|
||||||
vcpkg_install(grpc)
|
vcpkg_install(grpc)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user