changeset 635:cd3b60f6e7d4

refactoring cmake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Oct 2013 10:48:03 +0100
parents d775a3cb5a06
children 9ac1e8383877
files CMakeLists.txt LinuxCompilation.txt
diffstat 2 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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}
--- 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?
 --------------------------