Mercurial > hg > orthanc

changeset 1415:728c22ade2e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Jun 2015 21:30:25 +0200
parents 0a67a502c90f
children 037d5ffca74d
files LinuxCompilation.txt Resources/CMake/BoostConfiguration.cmake Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/GoogleLogConfiguration.cmake Resources/CMake/LibCurlConfiguration.cmake Resources/CMake/MongooseConfiguration.cmake Resources/OldBuildInstructions.txt
diffstat 7 files changed, 136 insertions(+), 114 deletions(-) [+]
line wrap: on
line diff
--- a/LinuxCompilation.txt	Wed Jun 03 21:14:05 2015 +0200
+++ b/LinuxCompilation.txt	Wed Jun 03 21:30:25 2015 +0200
@@ -74,44 +74,6 @@
 Orthanc users.
 
 
-SUPPORTED - Debian Squeeze (6.x)
---------------------------------
-
-# sudo apt-get install build-essential unzip cmake mercurial \
-       	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
-       	       	       libgoogle-glog-dev libpng-dev libgtest-dev \
-       	       	       libsqlite3-dev libssl-dev zlib1g-dev
-
-# cmake -DALLOW_DOWNLOADS=ON \
-  	-DUSE_SYSTEM_BOOST=OFF \
-	-DUSE_SYSTEM_DCMTK=OFF \
-	-DUSE_SYSTEM_MONGOOSE=OFF \
-	-DUSE_SYSTEM_JSONCPP=OFF \
-	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DENABLE_JPEG=OFF \
-        -DENABLE_JPEG_LOSSLESS=OFF \
-	~/Orthanc 
-
-
-SUPPORTED - Debian Wheezy (7.x)
--------------------------------
-
-# sudo apt-get install build-essential unzip cmake mercurial \
-       	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
-       	       	       libgtest-dev libpng-dev libsqlite3-dev \
-       	       	       libssl-dev zlib1g-dev libdcmtk2-dev \
-       	       	       libboost-all-dev libwrap0-dev libjsoncpp-dev
-
-# cmake -DALLOW_DOWNLOADS=ON \
-        -DUSE_SYSTEM_GOOGLE_LOG=OFF \
-	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
-	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DENABLE_JPEG=OFF \
-        -DENABLE_JPEG_LOSSLESS=OFF \
-	~/Orthanc
-
-
 SUPPORTED - Debian Jessie/Sid
 -----------------------------
 
@@ -150,75 +112,6 @@
 	~/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 libwrap0-dev libcharls-dev
-
-With JPEG:
-
-# cmake "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" \
-        -DALLOW_DOWNLOADS=ON \
-	-DUSE_SYSTEM_MONGOOSE=OFF \
-	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
-	-DUSE_SYSTEM_PUGIXML=OFF \
-	~/Orthanc
-
-
-Without JPEG:
-
-# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
-        -DALLOW_DOWNLOADS=ON \
-	-DUSE_SYSTEM_MONGOOSE=OFF \
-	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
-	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DENABLE_JPEG=OFF \
-        -DENABLE_JPEG_LOSSLESS=OFF \
-	~/Orthanc
-
-
-SUPPORTED - Ubuntu 13.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 libwrap0-dev libjsoncpp-dev
-
-# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
-        -DALLOW_DOWNLOADS=ON \
-	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
-	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DENABLE_JPEG=OFF \
-        -DENABLE_JPEG_LOSSLESS=OFF \
-	~/Orthanc
-
-
-
-SUPPORTED - Fedora 19/20
-------------------------
-
-# sudo yum install unzip make automake gcc gcc-c++ python cmake \
-                   boost-devel curl-devel dcmtk-devel glog-devel \
-                   gtest-devel libpng-devel libsqlite3x-devel libuuid-devel \
-                   mongoose-devel openssl-devel jsoncpp-devel lua-devel pugixml-devel
-
-# cmake  "-DDCMTK_LIBRARIES=CharLS" \
-         -DSYSTEM_MONGOOSE_USE_CALLBACKS=OFF \
-         ~/Orthanc
-       
-Note: Have also a look at the official package:
-http://pkgs.fedoraproject.org/cgit/orthanc.git/tree/?h=f18
-
-
 
 SUPPORTED - Ubuntu 14.04 LTS
 ----------------------------
@@ -231,6 +124,27 @@
 
 
 
+SUPPORTED - Fedora 20-22
+------------------------
+
+# sudo yum install unzip make automake gcc gcc-c++ python cmake \
+                   boost-devel curl-devel dcmtk-devel glog-devel \
+                   gtest-devel libpng-devel libsqlite3x-devel libuuid-devel \
+                   mongoose-devel openssl-devel jsoncpp-devel lua-devel pugixml-devel
+
+You will also have to install "gflags-devel" on Fedora 21&22:
+
+# sudo yum install gflags-devel
+
+# cmake  "-DDCMTK_LIBRARIES=CharLS" \
+         -DSYSTEM_MONGOOSE_USE_CALLBACKS=OFF \
+         ~/Orthanc
+       
+Note: Have also a look at the official package:
+http://pkgs.fedoraproject.org/cgit/orthanc.git/tree/?h=f18
+
+
+
 SUPPORTED - FreeBSD 10.1
 ------------------------
 
--- a/Resources/CMake/BoostConfiguration.cmake	Wed Jun 03 21:14:05 2015 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Wed Jun 03 21:30:25 2015 +0200
@@ -136,7 +136,7 @@
     -DBOOST_HAS_FILESYSTEM_V3=1
     )
 
-  if (${CMAKE_COMPILER_IS_GNUCXX})
+  if (CMAKE_COMPILER_IS_GNUCXX)
     add_definitions(-isystem ${BOOST_SOURCES_DIR})
   endif()
 
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Jun 03 21:14:05 2015 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Jun 03 21:30:25 2015 +0200
@@ -110,7 +110,7 @@
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
       )
 
-    if (${CMAKE_COMPILER_IS_GNUCXX})
+    if (CMAKE_COMPILER_IS_GNUCXX)
       # This is a patch for MinGW64
       execute_process(
         COMMAND patch -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-mingw64.patch
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Wed Jun 03 21:14:05 2015 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Wed Jun 03 21:30:25 2015 +0200
@@ -87,7 +87,7 @@
       WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
       )
 
-  else(${MSVC})
+  elseif (MSVC)
     # https://code.google.com/p/google-glog/issues/detail?id=117
     configure_file(
       ${ORTHANC_ROOT}/Resources/Patches/glog-visual-studio-port.h
@@ -149,7 +149,7 @@
       -DGOOGLE_GLOG_DLL_DECL=
       )
 
-    if (${CMAKE_COMPILER_IS_GNUCXX})
+    if (CMAKE_COMPILER_IS_GNUCXX)
       # This is a patch for MinGW64
       add_definitions(-D_TIME_H__S=1)
     endif()
--- a/Resources/CMake/LibCurlConfiguration.cmake	Wed Jun 03 21:14:05 2015 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Wed Jun 03 21:30:25 2015 +0200
@@ -32,7 +32,7 @@
     -DCURL_DISABLE_TFTP=1
     )
 
-  if (${ENABLE_SSL})
+  if (ENABLE_SSL)
     add_definitions(
       #-DHAVE_LIBSSL=1
       -DUSE_OPENSSL=1
--- a/Resources/CMake/MongooseConfiguration.cmake	Wed Jun 03 21:14:05 2015 +0200
+++ b/Resources/CMake/MongooseConfiguration.cmake	Wed Jun 03 21:30:25 2015 +0200
@@ -37,7 +37,7 @@
     )
 
 
-  if (${ENABLE_SSL})
+  if (ENABLE_SSL)
     add_definitions(
       -DNO_SSL_DL=1
       )
@@ -54,7 +54,7 @@
 
 
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    if (${CMAKE_COMPILER_IS_GNUCXX})
+    if (CMAKE_COMPILER_IS_GNUCXX)
       # This is a patch for MinGW64
       add_definitions(-D_TIMESPEC_DEFINED=1)
     endif()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/OldBuildInstructions.txt	Wed Jun 03 21:30:25 2015 +0200
@@ -0,0 +1,108 @@
+This file contains old build instructions that are not tested anymore.
+
+
+Debian Squeeze (6.x)
+--------------------
+
+# sudo apt-get install build-essential unzip cmake mercurial \
+       	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
+       	       	       libgoogle-glog-dev libpng-dev libgtest-dev \
+       	       	       libsqlite3-dev libssl-dev zlib1g-dev
+
+# cmake -DALLOW_DOWNLOADS=ON \
+  	-DUSE_SYSTEM_BOOST=OFF \
+	-DUSE_SYSTEM_DCMTK=OFF \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+	-DUSE_SYSTEM_JSONCPP=OFF \
+	-DUSE_SYSTEM_PUGIXML=OFF \
+        -DENABLE_JPEG=OFF \
+        -DENABLE_JPEG_LOSSLESS=OFF \
+	~/Orthanc 
+
+
+Debian Wheezy (7.x)
+-------------------
+
+# sudo apt-get install build-essential unzip cmake mercurial \
+       	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
+       	       	       libgtest-dev libpng-dev libsqlite3-dev \
+       	       	       libssl-dev zlib1g-dev libdcmtk2-dev \
+       	       	       libboost-all-dev libwrap0-dev libjsoncpp-dev
+
+# cmake -DALLOW_DOWNLOADS=ON \
+        -DUSE_SYSTEM_GOOGLE_LOG=OFF \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+	-DUSE_SYSTEM_PUGIXML=OFF \
+        -DENABLE_JPEG=OFF \
+        -DENABLE_JPEG_LOSSLESS=OFF \
+	~/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 libwrap0-dev libcharls-dev
+
+With JPEG:
+
+# cmake "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" \
+        -DALLOW_DOWNLOADS=ON \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+	-DUSE_SYSTEM_JSONCPP=OFF \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+	-DUSE_SYSTEM_PUGIXML=OFF \
+	~/Orthanc
+
+
+Without JPEG:
+
+# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
+        -DALLOW_DOWNLOADS=ON \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+	-DUSE_SYSTEM_JSONCPP=OFF \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+	-DUSE_SYSTEM_PUGIXML=OFF \
+        -DENABLE_JPEG=OFF \
+        -DENABLE_JPEG_LOSSLESS=OFF \
+	~/Orthanc
+
+
+SUPPORTED - Ubuntu 13.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 libwrap0-dev libjsoncpp-dev
+
+# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
+        -DALLOW_DOWNLOADS=ON \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+	-DUSE_SYSTEM_PUGIXML=OFF \
+        -DENABLE_JPEG=OFF \
+        -DENABLE_JPEG_LOSSLESS=OFF \
+	~/Orthanc
+
+
+SUPPORTED - Fedora 19
+---------------------
+
+# sudo yum install unzip make automake gcc gcc-c++ python cmake \
+                   boost-devel curl-devel dcmtk-devel glog-devel \
+                   gtest-devel libpng-devel libsqlite3x-devel libuuid-devel \
+                   mongoose-devel openssl-devel jsoncpp-devel lua-devel pugixml-devel
+
+# cmake  "-DDCMTK_LIBRARIES=CharLS" \
+         -DSYSTEM_MONGOOSE_USE_CALLBACKS=OFF \
+         ~/Orthanc
+       
+Note: Have also a look at the official package:
+http://pkgs.fedoraproject.org/cgit/orthanc.git/tree/?h=f18