Mercurial > hg > orthanc
changeset 2024:944b255035a0
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 18 Jun 2016 12:03:32 +0200 |
| parents | 7fe860db9664 |
| children | e7e1858d9504 |
| files | Core/HttpClient.cpp Resources/CMake/LibP11Configuration.cmake |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/HttpClient.cpp Sat Jun 18 10:05:47 2016 +0200 +++ b/Core/HttpClient.cpp Sat Jun 18 12:03:32 2016 +0200 @@ -770,7 +770,7 @@ { #if ORTHANC_PKCS11_ENABLED == 1 LOG(INFO) << "Initializing PKCS#11 using " << module - << (pin.empty() ? "(no PIN provided)" : "(PIN is provided)"); + << (pin.empty() ? " (no PIN provided)" : " (PIN is provided)"); GlobalParameters::GetInstance().InitializePkcs11(module, pin, verbose); #else LOG(ERROR) << "This version of Orthanc is compiled without support for PKCS11";
--- a/Resources/CMake/LibP11Configuration.cmake Sat Jun 18 10:05:47 2016 +0200 +++ b/Resources/CMake/LibP11Configuration.cmake Sat Jun 18 12:03:32 2016 +0200 @@ -7,6 +7,8 @@ ${LIBP11_SOURCES_DIR}/src/eng_front.c DESTINATION ${AUTOGENERATED_DIR}/libp11) +# Create an empty "config.h" to make "eng_front.c" happy +file(WRITE ${LIBP11_SOURCES_DIR}/src/config.h "") if (STATIC_BUILD OR NOT USE_SYSTEM_LIBP11) include_directories(${LIBP11_SOURCES_DIR}/src)