Skip to content

Commit

Permalink
Cmake update (#167)
Browse files Browse the repository at this point in the history
* * Adding option to cmake.sh for g++

* * Update cmake.sh to only ldconfig if not MAC

* * Updated cmake.sh script to parallelize properly on Mac and Linux
* Moved cmake.sh script to scripts directory instead of scripts/linux since it covers both mac and linux

* * Fixed bug in project path reference in cmake.sh after the script move
  • Loading branch information
jredmondson committed Jan 1, 2024
1 parent 64d8d37 commit 5bf6474
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions scripts/cmake.sh
Expand Up @@ -2,7 +2,7 @@

SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

MADARA_PATH=$SCRIPT_PATH/../..
PROJECT_PATH=$SCRIPT_PATH/..

C_COMPILER='gcc'
CPP_COMPILER='g++'
Expand Down Expand Up @@ -66,10 +66,10 @@ else
fi

echo SCRIPT_PATH=$SCRIPT_PATH
echo MADARA_PATH=$MADARA_PATH
echo PROJECT_PATH=$PROJECT_PATH

echo "Creating build and install directories..."
cd $MADARA_PATH
cd $PROJECT_PATH

if [ $CLEAN -eq 1 ]; then
echo "Cleaning build directory..."
Expand Down Expand Up @@ -99,8 +99,9 @@ if [ $PREREQS -eq 1 ]; then
fi

echo "Building with $PROCESSES threads..."
echo cmake -DCMAKE_CXX_COMPILER=${CPP_COMPILER} -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Dmadara_TESTS=${TESTS} -Dmadara_SSL=${SSL} -D'CMAKE_INSTALL_PREFIX=/usr/local' -DCMAKE_PREFIX_PATH=$MADARA_PATH/install ..
cmake -D'CMAKE_INSTALL_PREFIX=/usr/local' -Dmadara_TESTS=$TESTS -Dmadara_SSL=$SSL -DCMAKE_PREFIX_PATH=$MADARA_PATH/install -DCMAKE_CXX_COMPILER=$CPP_COMPILER -DCMAKE_C_COMPILER=$C_COMPILER -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..

echo cmake -DCMAKE_CXX_COMPILER=${CPP_COMPILER} -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Dmadara_TESTS=${TESTS} -Dmadara_SSL=${SSL} -D'CMAKE_INSTALL_PREFIX=/usr/local' -DCMAKE_PREFIX_PATH=$PROJECT_PATH/install ..
cmake -D'CMAKE_INSTALL_PREFIX=/usr/local' -Dmadara_TESTS=$TESTS -Dmadara_SSL=$SSL -DCMAKE_PREFIX_PATH=$PROJECT_PATH/install -DCMAKE_CXX_COMPILER=$CPP_COMPILER -DCMAKE_C_COMPILER=$C_COMPILER -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
cmake --build . --config debug -j $PROCESSES
cmake --build . --config release -j $PROCESSES
sudo cmake --build . --target install --config release
Expand Down

0 comments on commit 5bf6474

Please sign in to comment.