authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2020-01-17 02:45:32-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-01-17 02:45:32-05:00
logab2cb435e5e35a23f9674c2a382102de5f37449c
treeee6222c25f40c9c79e907f298244b28e8599ecab
parent0240fd91401c8a20064da0efd5b1e8955e481f1b
parent97cca1376aa5d5ed6ae699cc67b3c5e4b97f11bf
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4209 from mikdusan/cmake-install

cmake: fix install lib path message

1 files changed, 8 insertions(+), 8 deletions(-)

CMakeLists.txt+8-8
......@@ -609,12 +609,12 @@ else()
609609endif()
610610
611611set(BUILD_LIBUSERLAND_COMMAND zig0 build
612 --override-lib-dir "${CMAKE_SOURCE_DIR}/lib"
613 "-Doutput-dir=${CMAKE_BINARY_DIR}"
614 "-Drelease=${LIBUSERLAND_RELEASE_MODE}"
615 "-Dlib-files-only"
616 --prefix "${CMAKE_INSTALL_PREFIX}"
617 libuserland
612 --override-lib-dir "${CMAKE_SOURCE_DIR}/lib"
613 "-Doutput-dir=${CMAKE_BINARY_DIR}"
614 "-Drelease=${LIBUSERLAND_RELEASE_MODE}"
615 "-Dlib-files-only"
616 --prefix "${CMAKE_INSTALL_PREFIX}"
617 libuserland
618618)
619619
620620# When using Visual Studio build system generator we default to libuserland install.
......@@ -647,6 +647,6 @@ add_dependencies(zig zig_build_libuserland)
647647
648648install(TARGETS zig DESTINATION bin)
649649
650# CODE has no effect with Visual Studio build system generator
651install(CODE "message(\"-- Installing: /opt/zig/lib\")")
650# CODE has no effect with Visual Studio build system generator.
651install(CODE "message(\"-- Installing: ${CMAKE_INSTALL_PREFIX}/lib\")")
652652install(CODE "execute_process(COMMAND ${BUILD_LIBUSERLAND_COMMAND} install)")