Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

build.sh: switch from CMAKE_FRAMEWORK_PATH to CMAKE_MODULE_PATH #503

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

build.sh: switch from CMAKE_FRAMEWORK_PATH to CMAKE_MODULE_PATH #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ fi
# Prompt user for location of eosio.cdt.
cdt-directory-prompt

# Include CDT_INSTALL_DIR in CMAKE_FRAMEWORK_PATH
# Include CDT_INSTALL_DIR in CMAKE_PREFIX_PATH
echo "Using EOSIO.CDT installation at: $CDT_INSTALL_DIR"
export CMAKE_FRAMEWORK_PATH="${CDT_INSTALL_DIR}:${CMAKE_FRAMEWORK_PATH}"
CMAKE_PREFIX_PATH="${CDT_INSTALL_DIR}:${CMAKE_PREFIX_PATH}"

if [[ ${BUILD_TESTS} == true ]]; then
# Ensure eosio version is appropriate.
nodeos-version-check

# Include EOSIO_INSTALL_DIR in CMAKE_FRAMEWORK_PATH
# Include EOSIO_INSTALL_DIR in CMAKE_PREFIX_PATH
echo "Using EOSIO installation at: $EOSIO_INSTALL_DIR"
export CMAKE_FRAMEWORK_PATH="${EOSIO_INSTALL_DIR}:${CMAKE_FRAMEWORK_PATH}"
CMAKE_PREFIX_PATH="${EOSIO_INSTALL_DIR}:${CMAKE_PREFIX_PATH}"
fi

printf "\t=========== Building eosio.contracts ===========\n\n"
Expand All @@ -79,6 +79,6 @@ NC='\033[0m'
CPU_CORES=$(getconf _NPROCESSORS_ONLN)
mkdir -p build
pushd build &> /dev/null
cmake -DBUILD_TESTS=${BUILD_TESTS} ../
cmake -DBUILD_TESTS=${BUILD_TESTS} -DCMAKE_MODULE_PATH=${CMAKE_PREFIX_PATH} ../
make -j $CPU_CORES
popd &> /dev/null