Update oatpp

Author: sgallou

sources/external-libs/oatpp-openssl/CMakeLists.txt

@@ -14,7 +14,6 @@ list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DOATPP_MSVC_LINK_STATIC_RUNTIME=ON")
 if(NOT WIN32)
    list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 endif()
-list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5") # TODO remove when OATPP version will be > 1.3.0
 
 
 if(CMAKE_TOOLCHAIN_FILE)
@@ -64,8 +63,8 @@ endif(CMAKE_TOOLCHAIN_FILE)
 
 ExternalProject_Add (oatpp-openssl_build
    DEPENDS           oatpp_build
-   GIT_REPOSITORY    https://github.com/oatpp/oatpp-openssl.git
-   GIT_TAG           1.3.0-latest
+   GIT_REPOSITORY    https://github.com/Yadoms/oatpp-openssl.git
+   GIT_TAG           9c8f4e9b2d28e96e036d1fdb74ca222a933f2079
    GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${OATPP_OPENSSL_PATCH_CMD}   
    PREFIX            ${OATPP_OPENSSL_ROOT}

sources/external-libs/oatpp-websocket/CMakeLists.txt

@@ -15,7 +15,6 @@ list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DOATPP_MSVC_LINK_STATIC_RUNTIME=ON")
 if(NOT WIN32)
    list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 endif()
-list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5") # TODO remove when OATPP version will be > 1.3.0
 
 
 if(CMAKE_TOOLCHAIN_FILE)
@@ -65,8 +64,8 @@ endif(CMAKE_TOOLCHAIN_FILE)
 
 ExternalProject_Add (oatpp-websocket_build
    DEPENDS           oatpp_build
-   GIT_REPOSITORY    https://github.com/oatpp/oatpp-websocket.git
-   GIT_TAG           1.3.0-latest
+   GIT_REPOSITORY    https://github.com/Yadoms/oatpp-websocket.git
+   GIT_TAG           61ff2acc6960f2923b59e0c4a92fb4efe92be324
    GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${OATPP_WEBSOCKET_PATCH_CMD}   
    PREFIX            ${OATPP_WEBSOCKET_ROOT}

sources/external-libs/oatpp/CMakeLists.txt

@@ -9,7 +9,6 @@ list(APPEND OATPP_BUILD_ARGS "-DOATPP_MSVC_LINK_STATIC_RUNTIME=ON")
 if(NOT WIN32)
    list(APPEND OATPP_BUILD_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 endif()
-list(APPEND OATPP_BUILD_ARGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5") # TODO remove when OATPP version will be > 1.3.0
 
 
 if(CMAKE_TOOLCHAIN_FILE)
@@ -58,8 +57,8 @@ message("-- External lib - OATPP : cross compilation (toolchain:${CMAKE_TOOLCHAI
 endif(CMAKE_TOOLCHAIN_FILE)
 
 ExternalProject_Add (oatpp_build
-   GIT_REPOSITORY    https://github.com/oatpp/oatpp.git
-   GIT_TAG           1.3.0-latest
+   GIT_REPOSITORY    https://github.com/Yadoms/oatpp.git
+   GIT_TAG           056d45b85e2084cdae25cff9f8b850ecae1666ec
    GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${OATPP_PATCH_CMD}   
    PREFIX            ${OATPP_ROOT}

sources/server/Supervisor.cpp

@@ -335,7 +335,7 @@ std::unique_ptr<web::IWebServer> CSupervisor::createOatppBasedWebServer(
    const boost::shared_ptr<dataAccessLayer::IConfigurationManager>& configurationManager,
    bool skipPasswordCheck)
 {
-   return std::make_unique<web::oatppServer::CWebServer>(address,
+   return std::make_unique<web::oatpp_server::CWebServer>(address,
                                                          port,
                                                          useHttps,
                                                          httpsPort,
@@ -345,7 +345,7 @@ std::unique_ptr<web::IWebServer> CSupervisor::createOatppBasedWebServer(
                                                          "rest",
                                                          restServices,
                                                          "ws",
-                                                         boost::make_shared<web::oatppServer::CAuthentication>(
+                                                         boost::make_shared<web::oatpp_server::CAuthentication>(
                                                             configurationManager,
                                                             skipPasswordCheck));
 }