From 2b7a1cd28fa5c02f98a14adca7056a389e8eecbd Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Thu, 20 Jun 2019 14:08:55 +0200 Subject: [PATCH] build: Install static lib Add extra install step for installing lib along headers (Fixes: #1896). Also remove headers, lib when installing executable. This is useful for debian's iotjs-dev package Change-Id: Ib9f6cb50631f4cdfeb308108f91ed28e7d204dc4 Forwarded: https://github.com/jerryscript-project/iotjs/pull/1948 Origin: https://github.com/TizenTeam/iotjs/tree/sandbox/rzr/cmake/lib/review/master Bug: https://github.com/jerryscript-project/iotjs/issues/1945 Bug-Debian: https://bugs.debian.org/957364 Relate-to: https://github.com/TizenTeam/iotjs/tree/sandbox/rzr/cmake/lib/review/master Last-Update: 2020-10-15 IoT.js-DCO-1.0-Signed-off-by: Philippe Coval rzr@users.sf.net --- cmake/iotjs.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/cmake/iotjs.cmake b/cmake/iotjs.cmake index 2216f12e4c..eaeeb49ad9 100644 --- a/cmake/iotjs.cmake +++ b/cmake/iotjs.cmake @@ -501,6 +501,9 @@ set(IOTJS_PUBLIC_HEADERS # Configure the libiotjs set(TARGET_LIB_IOTJS libiotjs) +# Configure the libiotjs.a +set(TARGET_STATIC_IOTJS libiotjs) + if(CREATE_SHARED_LIB) add_library(${TARGET_LIB_IOTJS} SHARED ${LIB_IOTJS_SRC}) else() @@ -557,7 +560,13 @@ target_link_libraries(${TARGET_LIB_IOTJS} ${MBEDTLS_LIBS} ${EXTERNAL_LIBS} ) - +target_link_libraries(${TARGET_STATIC_IOTJS} + ${JERRY_LIBS} + ${TUV_LIBS} + libhttp-parser + ${MBEDTLS_LIBS} + ${EXTERNAL_LIBS} +) if("${LIB_INSTALL_DIR}" STREQUAL "") set(LIB_INSTALL_DIR "lib") endif() @@ -581,12 +590,12 @@ if(NOT BUILD_LIB_ONLY) target_include_directories(${TARGET_IOTJS} PRIVATE ${IOTJS_INCLUDE_DIRS}) target_link_libraries(${TARGET_IOTJS} ${TARGET_LIB_IOTJS}) install(TARGETS ${TARGET_IOTJS} - RUNTIME DESTINATION "${INSTALL_PREFIX}/bin" + RUNTIME DESTINATION "${INSTALL_PREFIX}/bin") + install(TARGETS ${TARGET_LIB_IOTJS} LIBRARY DESTINATION "${INSTALL_PREFIX}/lib" PUBLIC_HEADER DESTINATION "${INSTALL_PREFIX}/include/iotjs") if(CREATE_SHARED_LIB) install(TARGETS ${TARGET_LIB_IOTJS} - RUNTIME DESTINATION "${INSTALL_PREFIX}/bin" LIBRARY DESTINATION "${INSTALL_PREFIX}/lib" PUBLIC_HEADER DESTINATION "${INSTALL_PREFIX}/include/iotjs") endif()