diff options
| author | Ted John <ted@brambles.org> | 2017-07-14 21:36:48 +0100 |
|---|---|---|
| committer | Ted John <ted@brambles.org> | 2017-07-14 21:36:48 +0100 |
| commit | f28b8a99faad4b3d1f22416baa9b4cb9f604b223 (patch) | |
| tree | 553fd47d46b4bdcf117de27af050c45db36549b8 | |
| parent | 94e262d3f635b557ffde09e97bbca2c173a8f440 (diff) | |
| download | vcpkg-f28b8a99faad4b3d1f22416baa9b4cb9f604b223.tar.gz vcpkg-f28b8a99faad4b3d1f22416baa9b4cb9f604b223.zip | |
[duktape] Improve the cmake list to use BUILD_SHARED_LIBS
| -rw-r--r-- | ports/duktape/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | ports/duktape/portfile.cmake | 15 |
2 files changed, 10 insertions, 20 deletions
diff --git a/ports/duktape/CMakeLists.txt b/ports/duktape/CMakeLists.txt index bbbe062cc..f62a9c56e 100644 --- a/ports/duktape/CMakeLists.txt +++ b/ports/duktape/CMakeLists.txt @@ -1,23 +1,20 @@ # CMAKE project for duktape option(SOURCE_PATH "Root directory.") -option(ENABLE_STATIC "Build a static library.") -set (PROJECT duktape) -project (${PROJECT}) +project (duktape) file(GLOB_RECURSE DUKTAPE_SOURCES "${SOURCE_PATH}/src/*.c") file(GLOB_RECURSE DUKTAPE_HEADERS "${SOURCE_PATH}/src/*.h") -if (ENABLE_STATIC) - add_library(${PROJECT} STATIC ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS}) -else () +if (BUILD_SHARED_LIBS) add_definitions(-DDUK_F_DLL_BUILD) - add_library(${PROJECT} SHARED ${DUKTAPE_SOURCES}) endif () -set_target_properties(${PROJECT} PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}") +add_library(duktape ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS}) -install(TARGETS ${PROJECT} +set_target_properties("duktape" PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}") + +install(TARGETS duktape ARCHIVE DESTINATION "lib" RUNTIME DESTINATION "bin" PUBLIC_HEADER DESTINATION "include") diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index 8b7819524..b6e10396b 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -14,17 +14,10 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/duk_config.h.patch" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_configure_cmake( - SOURCE_PATH ${CMAKE_PATH} - OPTIONS -DENABLE_STATIC=OFF -DSOURCE_PATH=${SOURCE_PATH} - ) -else() - vcpkg_configure_cmake( - SOURCE_PATH ${CMAKE_PATH} - OPTIONS -DENABLE_STATIC=ON -DSOURCE_PATH=${SOURCE_PATH} - ) -endif() +vcpkg_configure_cmake( + SOURCE_PATH ${CMAKE_PATH} + OPTIONS -DSOURCE_PATH=${SOURCE_PATH} +) vcpkg_install_cmake() |