# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1373958025 -7200
# Node ID 888f8a778e70d7401571ea93a4e444c7fbd60341
# Parent  6f8ae46ed90e5bb02eb6c9da3687e0ec6ec51f59
move

diff -r 6f8ae46ed90e -r 888f8a778e70 OrthancCppClient/CMakeLists.txt
--- a/OrthancCppClient/CMakeLists.txt	Mon Jul 15 21:27:49 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# Mini-project to check whether "OrthancCppClient" can compile in a
-# standalone fashion
-
-cmake_minimum_required(VERSION 2.8)
-
-project(OrthancCppClientTest)
-
-SET(STATIC_BUILD OFF)
-
-include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DownloadPackage.cmake)
-include(${CMAKE_SOURCE_DIR}/../Resources/CMake/JsonCppConfiguration.cmake)
-include(${CMAKE_SOURCE_DIR}/../Resources/CMake/LibCurlConfiguration.cmake)
-
-if (${CMAKE_COMPILER_IS_GNUCXX})
-  set(CMAKE_C_FLAGS "-Wall -pedantic -Wno-implicit-function-declaration")  # --std=c99 makes libcurl not to compile
-  set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wno-long-long -Wno-variadic-macros")
-  set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
-  set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
-elseif (${MSVC})
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)  
-endif()
-
-add_library(OrthancCppClient
-  SHARED
-  ${THIRD_PARTY_SOURCES}
-  ../Core/OrthancException.cpp
-  ../Core/Enumerations.cpp
-  ../Core/HttpClient.cpp
-  )
-
-add_executable(Test
-  main.cpp
-  )
-
-target_link_libraries(Test OrthancCppClient)
diff -r 6f8ae46ed90e -r 888f8a778e70 OrthancCppClient/main.cpp
--- a/OrthancCppClient/main.cpp	Mon Jul 15 21:27:49 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege,
- * Belgium
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- **/
-
-
-#include "../Core/HttpClient.h"
-
-#include <iostream>
-
-int main()
-{
-  // Prepare a simple call to a Web service
-  Orthanc::HttpClient c;
-  c.SetUrl("http://nominatim.openstreetmap.org/search?format=json&q=chu+liege+belgium");
-  
-  // Do the request and store the result in a JSON structure
-  Json::Value result;
-  c.Apply(result);
-
-  // Display the JSON answer
-  std::cout << result << std::endl;
-
-  return 0;
-}
diff -r 6f8ae46ed90e -r 888f8a778e70 Resources/Samples/OrthancCppClient/Basic/CMakeLists.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Samples/OrthancCppClient/Basic/CMakeLists.txt	Tue Jul 16 09:00:25 2013 +0200
@@ -0,0 +1,37 @@
+# Mini-project to check whether "OrthancCppClient" can compile in a
+# standalone fashion
+
+cmake_minimum_required(VERSION 2.8)
+
+project(OrthancCppClientTest)
+
+SET(STATIC_BUILD OFF)
+
+set(ORTHANC_ROOT ${CMAKE_SOURCE_DIR}/../../../..)
+
+include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
+include(${ORTHANC_ROOT}/Resources/CMake/JsonCppConfiguration.cmake)
+include(${ORTHANC_ROOT}/Resources/CMake/LibCurlConfiguration.cmake)
+
+if (${CMAKE_COMPILER_IS_GNUCXX})
+  set(CMAKE_C_FLAGS "-Wall -pedantic -Wno-implicit-function-declaration")  # --std=c99 makes libcurl not to compile
+  set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wno-long-long -Wno-variadic-macros")
+  set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
+  set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+elseif (${MSVC})
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)  
+endif()
+
+add_library(OrthancCppClient
+  SHARED
+  ${THIRD_PARTY_SOURCES}
+  ${ORTHANC_ROOT}/Core/OrthancException.cpp
+  ${ORTHANC_ROOT}/Core/Enumerations.cpp
+  ${ORTHANC_ROOT}/Core/HttpClient.cpp
+  )
+
+add_executable(Test
+  main.cpp
+  )
+
+target_link_libraries(Test OrthancCppClient)
diff -r 6f8ae46ed90e -r 888f8a778e70 Resources/Samples/OrthancCppClient/Basic/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Samples/OrthancCppClient/Basic/main.cpp	Tue Jul 16 09:00:25 2013 +0200
@@ -0,0 +1,46 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ **/
+
+
+#include <iostream>
+
+#include "../../../../Core/HttpClient.h"
+
+int main()
+{
+  // Prepare a simple call to a Web service
+  Orthanc::HttpClient c;
+  c.SetUrl("http://nominatim.openstreetmap.org/search?format=json&q=chu+liege+belgium");
+  
+  // Do the request and store the result in a JSON structure
+  Json::Value result;
+  c.Apply(result);
+
+  // Display the JSON answer
+  std::cout << result << std::endl;
+
+  return 0;
+}