Skip to content

Commit

Permalink
Some minor tweaks to make it possible to build OpenCOR on Ubuntu 16.0…
Browse files Browse the repository at this point in the history
…4 LTS.
  • Loading branch information
agarny committed Apr 28, 2017
2 parents 29df012 + f74a4bd commit 5bd656f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions cmake/runpath2rpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ limitations under the License.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

//==============================================================================

Expand Down
8 changes: 7 additions & 1 deletion scripts/genericmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ fi

shift

if [ "`uname -s`" = "Linux" ]; then
compilers="-DCMAKE_C_COMPILER=/usr/bin/gcc-4.9 -DCMAKE_CXX_COMPILER=/usr/bin/g++-4.9"
else
compilers=""
fi

if [ "`hash ninja 2>&1`" = "" ]; then
ninjaFound=true
generator="Ninja"
Expand All @@ -31,7 +37,7 @@ echo "\033[44;37;1mMaking OpenCOR$titleTests (using $generator)...\033[0m"

cd build

cmake -G "$cmakeGenerator" -DCMAKE_BUILD_TYPE=$cmakeBuildType -DENABLE_TESTS=$enableTests ..
cmake -G "$cmakeGenerator" $compilers -DCMAKE_BUILD_TYPE=$cmakeBuildType -DENABLE_TESTS=$enableTests ..

exitCode=$?

Expand Down

0 comments on commit 5bd656f

Please sign in to comment.