# HG changeset patch # User Sebastien Jodogne # Date 1349777247 -7200 # Node ID a2dbb5024fdfae2a0123b11bcc6a436188169768 # Parent bdc60d16cc984075d1b1fa241cb903bb8fd8b5b2 install in cmake diff -r bdc60d16cc98 -r a2dbb5024fdf CMakeLists.txt --- a/CMakeLists.txt Tue Oct 09 11:58:22 2012 +0200 +++ b/CMakeLists.txt Tue Oct 09 12:07:27 2012 +0200 @@ -2,21 +2,29 @@ project(Orthanc) +# Version of the build, should always be "mainline" except in release branches +add_definitions( + -DORTHANC_VERSION="mainline" + ) + # Parameters of the build SET(STATIC_BUILD ON CACHE BOOL "Static build of the third-party libraries (necessary for Windows)") SET(STANDALONE_BUILD OFF CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)") SET(ENABLE_SSL ON CACHE BOOL "Include support for SSL") SET(BUILD_UNIT_TESTS ON CACHE BOOL "Build the unit tests") -SET(DEBIAN_FORCE_HARDENING OFF CACHE BOOL "Force the injection of Debian hardening flags (unrecommended)") + +# Advanced parameters (for Debian packaging) SET(USE_DYNAMIC_JSONCPP OFF CACHE BOOL "Use the dynamic version of JsonCpp (only for Debian sid)") SET(USE_DYNAMIC_GOOGLE_LOG ON CACHE BOOL "Use the dynamic version of Google Log") SET(USE_DYNAMIC_GOOGLE_TEST ON CACHE BOOL "Use the dynamic version of Google Test (not for Debian sid)") -SET(USE_STATIC_DEBIAN_GOOGLE_TEST OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (only for Debian sid)") +SET(DEBIAN_FORCE_HARDENING OFF CACHE BOOL "Force the injection of Debian hardening flags (unrecommended)") +SET(DEBIAN_USE_STATIC_GOOGLE_TEST OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (only for Debian sid)") -# Version of the build, should always be "mainline" except in release branches -add_definitions( - -DORTHANC_VERSION="mainline" - ) +mark_as_advanced(USE_DYNAMIC_JSONCPP) +mark_as_advanced(USE_DYNAMIC_GOOGLE_LOG) +mark_as_advanced(USE_DYNAMIC_GOOGLE_TEST) +mark_as_advanced(DEBIAN_FORCE_HARDENING) +mark_as_advanced(DEBIAN_USE_STATIC_GOOGLE_TEST) # Some basic inclusions include(CheckIncludeFiles) @@ -134,6 +142,11 @@ target_link_libraries(Orthanc ServerLibrary CoreLibrary) +install( + TARGETS Orthanc + RUNTIME DESTINATION bin + ) + # Build the unit tests if required if (BUILD_UNIT_TESTS) diff -r bdc60d16cc98 -r a2dbb5024fdf Resources/CMake/GoogleTestConfiguration.cmake --- a/Resources/CMake/GoogleTestConfiguration.cmake Tue Oct 09 11:58:22 2012 +0200 +++ b/Resources/CMake/GoogleTestConfiguration.cmake Tue Oct 09 12:07:27 2012 +0200 @@ -1,4 +1,4 @@ -if (USE_STATIC_DEBIAN_GOOGLE_TEST) +if (DEBIAN_USE_STATIC_GOOGLE_TEST) message(FATAL_ERROR "todo") elseif (STATIC_BUILD OR NOT USE_DYNAMIC_GOOGLE_TEST)