| ... | @@ -609,12 +609,12 @@ else() | ... | @@ -609,12 +609,12 @@ else() |
| 609 | endif() | 609 | endif() |
| 610 | | 610 | |
| 611 | set(BUILD_LIBUSERLAND_COMMAND zig0 build | 611 | set(BUILD_LIBUSERLAND_COMMAND zig0 build |
| 612 | --override-lib-dir "${CMAKE_SOURCE_DIR}/lib" | 612 | --override-lib-dir "${CMAKE_SOURCE_DIR}/lib" |
| 613 | "-Doutput-dir=${CMAKE_BINARY_DIR}" | 613 | "-Doutput-dir=${CMAKE_BINARY_DIR}" |
| 614 | "-Drelease=${LIBUSERLAND_RELEASE_MODE}" | 614 | "-Drelease=${LIBUSERLAND_RELEASE_MODE}" |
| 615 | "-Dlib-files-only" | 615 | "-Dlib-files-only" |
| 616 | --prefix "${CMAKE_INSTALL_PREFIX}" | 616 | --prefix "${CMAKE_INSTALL_PREFIX}" |
| 617 | libuserland | 617 | libuserland |
| 618 | ) | 618 | ) |
| 619 | | 619 | |
| 620 | # When using Visual Studio build system generator we default to libuserland install. | 620 | # When using Visual Studio build system generator we default to libuserland install. |
| ... | @@ -647,6 +647,6 @@ add_dependencies(zig zig_build_libuserland) | ... | @@ -647,6 +647,6 @@ add_dependencies(zig zig_build_libuserland) |
| 647 | | 647 | |
| 648 | install(TARGETS zig DESTINATION bin) | 648 | install(TARGETS zig DESTINATION bin) |
| 649 | | 649 | |
| 650 | # CODE has no effect with Visual Studio build system generator | 650 | # CODE has no effect with Visual Studio build system generator. |
| 651 | install(CODE "message(\"-- Installing: /opt/zig/lib\")") | 651 | install(CODE "message(\"-- Installing: ${CMAKE_INSTALL_PREFIX}/lib\")") |
| 652 | install(CODE "execute_process(COMMAND ${BUILD_LIBUSERLAND_COMMAND} install)") | 652 | install(CODE "execute_process(COMMAND ${BUILD_LIBUSERLAND_COMMAND} install)") |