comparison Resources/CMake/OrthancFrameworkConfiguration.cmake @ 4030:100fbe970762

DANGEROUS commit: removing HAS_EMBEDDED_RESOURCES
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 20:50:20 +0200
parents 05a363186da6
children e3b3af80732d
comparison
equal deleted inserted replaced
4029:156fece692e3 4030:100fbe970762
602 add_definitions(-DORTHANC_ENABLE_LOGGING_STDIO=1) 602 add_definitions(-DORTHANC_ENABLE_LOGGING_STDIO=1)
603 else() 603 else()
604 add_definitions(-DORTHANC_ENABLE_LOGGING_STDIO=0) 604 add_definitions(-DORTHANC_ENABLE_LOGGING_STDIO=0)
605 endif() 605 endif()
606 606
607
608 if (HAS_EMBEDDED_RESOURCES)
609 add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1)
610
611 if (ENABLE_WEB_SERVER)
612 list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
613 ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp
614 )
615 endif()
616
617 elseif (STANDALONE_BUILD)
618 # No embedded resources are provided by the external project, but
619 # some are required by the Orthanc framework (DCMTK and ICU)
620 add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1)
621
622 EmbedResources(
623 ${DCMTK_DICTIONARIES}
624 ${LIBICU_RESOURCES}
625 )
626
627 list(APPEND ORTHANC_DICOM_SOURCES_DEPENDENCIES
628 ${AUTOGENERATED_SOURCES}
629 )
630
631 else()
632 # Neither the external project, nor the Orthanc framework have to
633 # embed external resources
634 add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=0)
635 endif()
636
637 607
638 608
639 ##################################################################### 609 #####################################################################
640 ## Configuration of Orthanc versioning macros (new in Orthanc 1.5.0) 610 ## Configuration of Orthanc versioning macros (new in Orthanc 1.5.0)
641 ##################################################################### 611 #####################################################################
704 ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/zip.c 674 ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/zip.c
705 ) 675 )
706 endif() 676 endif()
707 677
708 678
679 if (NOT ORTHANC_BUILDING_FRAMEWORK_LIBRARY)
680 list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
681 ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp
682 )
683 endif()
684
685
709 set(ORTHANC_CORE_SOURCES 686 set(ORTHANC_CORE_SOURCES
710 ${ORTHANC_CORE_SOURCES_INTERNAL} 687 ${ORTHANC_CORE_SOURCES_INTERNAL}
711 ${ORTHANC_CORE_SOURCES_DEPENDENCIES} 688 ${ORTHANC_CORE_SOURCES_DEPENDENCIES}
712 ) 689 )
713 690