Mercurial > hg > orthanc
changeset 1393:56f613d1df29
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 29 May 2015 17:58:29 +0200 |
| parents | 477e35614602 |
| children | b92de82e8869 |
| files | CMakeLists.txt Plugins/Samples/ServeFolders/CMakeLists.txt |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri May 29 17:53:32 2015 +0200 +++ b/CMakeLists.txt Fri May 29 17:58:29 2015 +0200 @@ -393,7 +393,7 @@ include(ExternalProject) externalproject_add(ServeFolders - CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DSERVE_FOLDERS_VERSION:STRING=${ORTHANC_VERSION} -DALLOW_DOWNLOADS:BOOL=ON -DUSE_SYSTEM_JSONCPP:BOOL=${USE_SYSTEM_JSONCPP} -DCMAKE_INSTALL_PREFIX=Install + CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DSERVE_FOLDERS_VERSION:STRING=${ORTHANC_VERSION} -DALLOW_DOWNLOADS:BOOL=ON -DSTATIC_BUILD=BOOL=${STATIC_BUILD} -DUSE_SYSTEM_JSONCPP:BOOL=${USE_SYSTEM_JSONCPP} -DCMAKE_INSTALL_PREFIX=Install SOURCE_DIR ${CMAKE_SOURCE_DIR}/Plugins/Samples/ServeFolders )
--- a/Plugins/Samples/ServeFolders/CMakeLists.txt Fri May 29 17:53:32 2015 +0200 +++ b/Plugins/Samples/ServeFolders/CMakeLists.txt Fri May 29 17:58:29 2015 +0200 @@ -3,6 +3,7 @@ project(ServeFolders) SET(SERVE_FOLDERS_VERSION "0.0" CACHE STRING "Version of the plugin") +SET(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)") SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages") SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")