Skip to content

Commit

Permalink
do not force STATIC_DEPS=all on windows
Browse files Browse the repository at this point in the history
such that we can protentially package for msys2 or vcpkg
  • Loading branch information
andyli committed Dec 15, 2017
1 parent 68ac0c6 commit 414af43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ configure_file (
"${CMAKE_BINARY_DIR}/neko.h"
)

set(ndll_targets
)

set(external_deps
BoehmGC
Zlib
Expand All @@ -112,12 +109,10 @@ set(external_deps
MbedTLS
)

set(STATIC_DEPS_DOC "Dependencies that should be linked statically. Can be \"all\", \"none\", or a list of library names (e.g. \"${external_deps}\").")

if (WIN32)
set(STATIC_DEPS "all")
set(STATIC_DEPS_DEFAULT "all")
else()
set(STATIC_DEPS "none" CACHE STRING "${STATIC_DEPS_DOC}")
set(STATIC_DEPS_DEFAULT "none")

option(RELOCATABLE "Set RPATH to $ORIGIN (Linux) / @executable_path (Mac)." ON)

Expand All @@ -126,10 +121,8 @@ else()
endif()
endif()


# These ndll cannot be skipped.
set(core_ndll_targets
)
set(STATIC_DEPS_DOC "Dependencies that should be linked statically. Can be \"all\", \"none\", or a list of library names (e.g. \"${external_deps}\").")
set(STATIC_DEPS ${STATIC_DEPS_DEFAULT} CACHE STRING "${STATIC_DEPS_DOC}")

# Validate STATIC_DEPS
if (STATIC_DEPS STREQUAL "all")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Settings that allow to exclude libraries and their dependencies from the build;

#### `STATIC_DEPS`

Available on Mac/Linux. Default value: `none`
Default value: `all` for Windows, `none` otherwise

It defines the dependencies that should be linked statically. Can be `all`, `none`, or a list of library names (e.g. `BoehmGC;Zlib;OpenSSL;MariaDBConnector;PCRE;Sqlite3;APR;APRutil;Apache;MbedTLS`).

Expand Down

0 comments on commit 414af43

Please sign in to comment.