From a1967b2fe82547e3d1f922c882941afb2fb7ad2b Mon Sep 17 00:00:00 2001 From: Ioannis Date: Tue, 5 Jan 2021 12:20:04 +0200 Subject: [PATCH] Avoid using system paths for Random123 since it's needed to be in specific subdir - Removed CI hacks for finding the proper Random123 --- .github/workflows/coreneuron-ci.yml | 3 +-- CMake/AddRandom123Submodule.cmake | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coreneuron-ci.yml b/.github/workflows/coreneuron-ci.yml index bd3e26abd..9d9249ded 100644 --- a/.github/workflows/coreneuron-ci.yml +++ b/.github/workflows/coreneuron-ci.yml @@ -106,8 +106,7 @@ jobs: fi if [[ "${{ startsWith(matrix.os, 'macOS') }}" = "true" ]]; then - git submodule update --init -- external/Random123 - export PATH=${{runner.workspace}}/CoreNeuron/external/Random123:/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH; + export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH; export CXX=g++; export CC=gcc; fi diff --git a/CMake/AddRandom123Submodule.cmake b/CMake/AddRandom123Submodule.cmake index 6178ac214..35892f52f 100644 --- a/CMake/AddRandom123Submodule.cmake +++ b/CMake/AddRandom123Submodule.cmake @@ -10,7 +10,8 @@ find_package(FindPkgConfig QUIET) find_path( Random123_PROJ NAMES LICENSE - PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/Random123") + PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/Random123" + NO_SYSTEM_ENVIRONMENT_PATH) find_package_handle_standard_args(Random123 REQUIRED_VARS Random123_PROJ)