# HG changeset patch # User Sebastien Jodogne # Date 1383040083 -3600 # Node ID cd3b60f6e7d48b97ee532c01f36267ff8ac6ff8e # Parent d775a3cb5a068f61041ce9b2b8744e27d6c5beb5 refactoring cmake diff -r d775a3cb5a06 -r cd3b60f6e7d4 CMakeLists.txt --- a/CMakeLists.txt Tue Oct 29 10:31:02 2013 +0100 +++ b/CMakeLists.txt Tue Oct 29 10:48:03 2013 +0100 @@ -235,9 +235,10 @@ ##################################################################### -## Build the unit tests if required +## Build the unit tests ##################################################################### +add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1) include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) add_executable(UnitTests ${GTEST_SOURCES} diff -r d775a3cb5a06 -r cd3b60f6e7d4 LinuxCompilation.txt --- a/LinuxCompilation.txt Tue Oct 29 10:31:02 2013 +0100 +++ b/LinuxCompilation.txt Tue Oct 29 10:48:03 2013 +0100 @@ -64,7 +64,9 @@ -------------------------------- # sudo apt-get install build-essential unzip cmake mercurial \ - uuid-dev libcurl4-gnutls-dev liblua5.1-0-dev + uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \ + libgoogle-glog-dev libpng-dev \ + libsqlite3-dev libssl-dev zlib1g-dev # cmake -DALLOW_DOWNLOADS=ON \ -DUSE_SYSTEM_BOOST=OFF \ @@ -74,6 +76,23 @@ ~/Orthanc +SUPPORTED - Ubuntu 12.10 +------------------------ + +# sudo apt-get install build-essential unzip cmake mercurial \ + uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \ + libgoogle-glog-dev libgtest-dev libpng-dev \ + libsqlite3-dev libssl-dev zlib1g-dev \ + libdcmtk2-dev libboost-all-dev + +# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \ + -DALLOW_DOWNLOADS=ON \ + -DUSE_SYSTEM_MONGOOSE=OFF \ + -DUSE_SYSTEM_JSONCPP=OFF \ + -DUSE_GTEST_DEBIAN_PACKAGE=ON \ + ~/Orthanc + + Other Linux distributions? --------------------------