# HG changeset patch # User Sebastien Jodogne # Date 1380542072 -7200 # Node ID bf2fda1c6760ccc76ee14bfd903ba70d75d19707 # Parent 6f01dd71b601359f70a34893f10521750ffcc52e fix paths diff -r 6f01dd71b601 -r bf2fda1c6760 CMakeLists.txt --- a/CMakeLists.txt Mon Sep 30 13:50:49 2013 +0200 +++ b/CMakeLists.txt Mon Sep 30 13:54:32 2013 +0200 @@ -265,7 +265,7 @@ ##################################################################### if (BUILD_CLIENT_LIBRARY) - include_directories(${ORTHANC_ROOT}/OrthancCppClient/Package/Laaw) + include_directories(${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/Laaw) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if (CMAKE_CROSSCOMPILING) @@ -273,9 +273,9 @@ set(CMAKE_SHARED_LIBRARY_PREFIX "") if (${CMAKE_SIZEOF_VOID_P} EQUAL 4) - set(ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/Package/AUTOGENERATED/Windows32.def) + set(ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.def) elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8) - set(ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/Package/AUTOGENERATED/Windows64.def) + set(ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.def) else() message(FATAL_ERROR "Support your platform here") endif() @@ -285,10 +285,10 @@ if (${CMAKE_SIZEOF_VOID_P} EQUAL 4) set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows32.dll") - list(APPEND ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/Package/AUTOGENERATED/Windows32.rc) + list(APPEND ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc) elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8) set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows64.dll") - list(APPEND ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/Package/AUTOGENERATED/Windows64.rc) + list(APPEND ORTHANC_CPP_CLIENT_AUX ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc) else() message(FATAL_ERROR "Support your platform here") endif() @@ -311,7 +311,7 @@ ${ORTHANC_ROOT}/OrthancCppClient/Study.cpp ${ORTHANC_ROOT}/OrthancCppClient/Instance.cpp ${ORTHANC_ROOT}/OrthancCppClient/Patient.cpp - ${ORTHANC_ROOT}/OrthancCppClient/Package/SharedLibrary.cpp + ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/SharedLibrary.cpp ${ORTHANC_ROOT}/Resources/sha1/sha1.cpp ${ORTHANC_ROOT}/Resources/md5/md5.c ${ORTHANC_ROOT}/Resources/base64/base64.cpp @@ -322,7 +322,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set_target_properties(OrthancClient - PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${ORTHANC_ROOT}/OrthancCppClient/Package/Laaw/VersionScript.map" + PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/Laaw/VersionScript.map" ) target_link_libraries(OrthancClient pthread) @@ -346,7 +346,7 @@ ) install( - FILES ${ORTHANC_ROOT}/OrthancCppClient/Package/AUTOGENERATED/OrthancCppClient.h + FILES ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h DESTINATION include/orthanc ) endif() diff -r 6f01dd71b601 -r bf2fda1c6760 Core/Enumerations.h --- a/Core/Enumerations.h Mon Sep 30 13:50:49 2013 +0200 +++ b/Core/Enumerations.h Mon Sep 30 13:54:32 2013 +0200 @@ -32,7 +32,7 @@ #pragma once -#include "../OrthancCppClient/Package/Laaw/laaw.h" +#include "../OrthancCppClient/SharedLibrary/Laaw/laaw.h" namespace Orthanc { diff -r 6f01dd71b601 -r bf2fda1c6760 OrthancCppClient/OrthancClientException.h --- a/OrthancCppClient/OrthancClientException.h Mon Sep 30 13:50:49 2013 +0200 +++ b/OrthancCppClient/OrthancClientException.h Mon Sep 30 13:54:32 2013 +0200 @@ -33,7 +33,7 @@ #pragma once #include "../Core/OrthancException.h" -#include "Package/Laaw/laaw.h" +#include "SharedLibrary/Laaw/laaw.h" namespace OrthancClient {