| author |  Andrew Kelley <andrew@ziglang.org> 2018-04-10 20:57:37-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-04-10 20:57:37-04:00 |
| log | ee3e2790aa85c624fc952bc8326b82d72843bb17 |
| tree | 779cc68d812111aeab50a813bb029714e2e50803 |
| parent | 477ded9042f045a322b3e92c632e322834a0cdd9 |
cmake defaults stage1 to install in build directory
2 files changed, 9 insertions(+), 4 deletions(-)
CMakeLists.txt+5
| ... | @@ -5,6 +5,11 @@ if(NOT CMAKE_BUILD_TYPE) | ... | @@ -5,6 +5,11 @@ if(NOT CMAKE_BUILD_TYPE) |
| 5 | "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) | 5 | "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) |
| 6 | endif() | 6 | endif() |
| 7 | 7 | ||
| 8 | if(NOT CMAKE_INSTALL_PREFIX) | ||
| 9 | set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING | ||
| 10 | "Directory to install zig to" FORCE) | ||
| 11 | endif() | ||
| 12 | |||
| 8 | project(zig C CXX) | 13 | project(zig C CXX) |
| 9 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) | 14 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
| 10 | 15 |
README.md+4-4
| ... | @@ -141,10 +141,10 @@ libc. Create demo games using Zig. | ... | @@ -141,10 +141,10 @@ libc. Create demo games using Zig. |
| 141 | ``` | 141 | ``` |
| 142 | mkdir build | 142 | mkdir build |
| 143 | cd build | 143 | cd build |
| 144 | cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) | 144 | cmake .. |
| 145 | make | 145 | make |
| 146 | make install | 146 | make install |
| 147 | ./zig build --build-file ../build.zig test | 147 | bin/zig build --build-file ../build.zig test |
| 148 | ``` | 148 | ``` |
| 149 | 149 | ||
| 150 | ##### MacOS | 150 | ##### MacOS |
| ... | @@ -154,9 +154,9 @@ brew install cmake llvm@6 | ... | @@ -154,9 +154,9 @@ brew install cmake llvm@6 |
| 154 | brew outdated llvm@6 || brew upgrade llvm@6 | 154 | brew outdated llvm@6 || brew upgrade llvm@6 |
| 155 | mkdir build | 155 | mkdir build |
| 156 | cd build | 156 | cd build |
| 157 | cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd) | 157 | cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ |
| 158 | make install | 158 | make install |
| 159 | ./zig build --build-file ../build.zig test | 159 | bin/zig build --build-file ../build.zig test |
| 160 | ``` | 160 | ``` |
| 161 | 161 | ||
| 162 | ##### Windows | 162 | ##### Windows |