diff options
| author | TBK <tbk@jjtc.eu> | 2020-02-23 23:58:06 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-02-23 22:36:21 -0300 |
| commit | 9a238d2748598627c5f9dcf66513b1bd7d7e6487 (patch) | |
| tree | a2743baa0aa720e4f9a78eda4b8ea9918c759364 /testing/jsonnet/build-cli-shared.patch | |
| parent | b2a86012a9ed6129882d66266feee8f801b5b963 (diff) | |
| download | aports-9a238d2748598627c5f9dcf66513b1bd7d7e6487.tar.bz2 aports-9a238d2748598627c5f9dcf66513b1bd7d7e6487.tar.xz | |
testing/jsonnet: upgrade to 0.15.0
Diffstat (limited to 'testing/jsonnet/build-cli-shared.patch')
| -rw-r--r-- | testing/jsonnet/build-cli-shared.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/testing/jsonnet/build-cli-shared.patch b/testing/jsonnet/build-cli-shared.patch deleted file mode 100644 index f10d79edbf..0000000000 --- a/testing/jsonnet/build-cli-shared.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,7 @@ - # User-configurable options. - option(BUILD_JSONNET "Build jsonnet command-line tool." ON) - option(BUILD_JSONNETFMT "Build jsonnetfmt command-line tool." ON) -+option(BUILD_CLI_SHARED "Build command-line tools against shared lib" OFF) - option(BUILD_TESTS "Build and run jsonnet tests." ON) - option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF) - set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING - ---- a/cmd/CMakeLists.txt -+++ b/cmd/CMakeLists.txt -@@ -2,16 +2,28 @@ - - if (BUILD_JSONNET OR BUILD_TESTS) - add_executable(jsonnet ${LIBJSONNET_SOURCE} jsonnet.cpp utils.cpp) -- add_dependencies(jsonnet libjsonnet_static) -- target_link_libraries(jsonnet libjsonnet_static) - -+ if (BUILD_CLI_SHARED) -+ add_dependencies(jsonnet libjsonnet) -+ target_link_libraries(jsonnet libjsonnet) -+ else() -+ add_dependencies(jsonnet libjsonnet_static) -+ target_link_libraries(jsonnet libjsonnet_static) -+ endif() -+ - install(TARGETS jsonnet DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif() - - if (BUILD_JSONNETFMT OR BUILD_TESTS) - add_executable(jsonnetfmt ${LIBJSONNET_SOURCE} jsonnetfmt.cpp utils.cpp) -- add_dependencies(jsonnetfmt libjsonnet_static) -- target_link_libraries(jsonnetfmt libjsonnet_static) -+ -+ if (BUILD_CLI_SHARED) -+ add_dependencies(jsonnetfmt libjsonnet) -+ target_link_libraries(jsonnetfmt libjsonnet) -+ else() -+ add_dependencies(jsonnetfmt libjsonnet_static) -+ target_link_libraries(jsonnetfmt libjsonnet_static) -+ endif() - - install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif() |