Skip to content

Commit b98b1b0

Browse files
authored
Merge pull request #7 from sincatter/fixbug-cmakeMac-20171206
add include and library folder on Mac
2 parents 60d046f + b2d85bb commit b98b1b0

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ project(magent)
55
IF (APPLE)
66
set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
77
link_directories("/usr/local/opt/llvm/lib")
8+
include_directories( "/usr/local/include" )
9+
link_directories("/usr/local/lib/")
810
ENDIF()
911

1012
file(GLOB autopilot_sources src/*.cc src/gridworld/*.cc src/discrete_snake/*.cc src/utility/*.cc)

build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,11 @@ fi
88
mkdir -p build
99
cd build
1010
cmake ..
11-
make -j $(nproc)
11+
#make -j $(nproc)
12+
if [[ "$OSTYPE" == "linux-gnu" ]]; then
13+
# Linux
14+
make -j `nproc`
15+
elif [[ "$OSTYPE" == "darwin"* ]]; then
16+
# Mac OSX
17+
make -j `sysctl -n hw.ncpu`
18+
fi

0 commit comments

Comments
 (0)