Mercurial > hg > orthanc-dicomweb
changeset 644:1efd6296c589
merge
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 24 Jan 2024 13:28:34 +0100 |
| parents | a111b79189c2 (current diff) 313b62d9ede8 (diff) |
| children | 503d1f209f34 4fe4279625f8 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Jan 24 13:27:51 2024 +0100 +++ b/CMakeLists.txt Wed Jan 24 13:28:34 2024 +0100 @@ -205,8 +205,6 @@ add_dependencies(OrthancDicomWeb AutogeneratedTarget) -DefineSourceBasenameForTarget(OrthancDicomWeb) - message("Setting the version of the library to ${ORTHANC_DICOM_WEB_VERSION}") add_definitions(-DORTHANC_DICOM_WEB_VERSION="${ORTHANC_DICOM_WEB_VERSION}") @@ -236,4 +234,7 @@ ${GOOGLE_TEST_LIBRARIES} ) -DefineSourceBasenameForTarget(UnitTests) \ No newline at end of file +if (COMMAND DefineSourceBasenameForTarget) + DefineSourceBasenameForTarget(OrthancDicomWeb) + DefineSourceBasenameForTarget(UnitTests) +endif()
--- a/Resources/holy-build-box-compile.sh Wed Jan 24 13:27:51 2024 +0100 +++ b/Resources/holy-build-box-compile.sh Wed Jan 24 13:28:34 2024 +0100 @@ -30,7 +30,7 @@ --user $(id -u):$(id -g) \ -v ${ROOT_DIR}:/source:ro \ -v ${ROOT_DIR}/holy-build-box:/target:rw \ - phusion/holy-build-box-64:2.0.1 \ + phusion/holy-build-box-64:3.0.5 \ bash /source/Resources/holy-build-box-internal.sh $1 ls -lR ${ROOT_DIR}/holy-build-box/