Browse Source

Update oatpp framework to the latest version. (#5393)

Leonid Stryzhevskyi 5 years ago
parent
commit
ef6da194f9

+ 2 - 2
frameworks/C++/oatpp/oatpp-async-no-mp.dockerfile

@@ -1,4 +1,4 @@
-FROM lganzzzo/ubuntu-cmake
+FROM lganzzzo/ubuntu-cmake-mimalloc
 
 #---------------------------------------------------------------
 # install oatpp
@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
+RUN git checkout afbafe447ff447db5ab227022eb4a568da97d16b
 
 WORKDIR /test/oatpp/build
 

+ 2 - 2
frameworks/C++/oatpp/oatpp-async.dockerfile

@@ -1,4 +1,4 @@
-FROM lganzzzo/ubuntu-cmake
+FROM lganzzzo/ubuntu-cmake-mimalloc
 
 #---------------------------------------------------------------
 # install oatpp
@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
+RUN git checkout afbafe447ff447db5ab227022eb4a568da97d16b
 
 WORKDIR /test/oatpp/build
 

+ 2 - 2
frameworks/C++/oatpp/oatpp-no-mp.dockerfile

@@ -1,4 +1,4 @@
-FROM lganzzzo/ubuntu-cmake
+FROM lganzzzo/ubuntu-cmake-mimalloc
 
 #---------------------------------------------------------------
 # install oatpp
@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
+RUN git checkout afbafe447ff447db5ab227022eb4a568da97d16b
 
 WORKDIR /test/oatpp/build
 

+ 2 - 2
frameworks/C++/oatpp/oatpp.dockerfile

@@ -1,4 +1,4 @@
-FROM lganzzzo/ubuntu-cmake
+FROM lganzzzo/ubuntu-cmake-mimalloc
 
 #---------------------------------------------------------------
 # install oatpp
@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 WORKDIR /test/oatpp
 
-RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
+RUN git checkout afbafe447ff447db5ab227022eb4a568da97d16b
 
 WORKDIR /test/oatpp/build
 

+ 3 - 1
frameworks/C++/oatpp/src-async/CMakeLists.txt

@@ -19,11 +19,13 @@ add_executable(${project_name}
 
 ## link libs
 
-find_package(oatpp 0.19.9 REQUIRED)
+find_package(oatpp 0.19.12 REQUIRED)
+find_package(mimalloc 1.0 REQUIRED)
 
 target_link_libraries(${project_name}
         PUBLIC oatpp::oatpp
         PUBLIC oatpp::oatpp-test
+        PUBLIC mimalloc-static
 )
 
 set_target_properties(${project_name} PROPERTIES

+ 3 - 1
frameworks/C++/oatpp/src-thread/CMakeLists.txt

@@ -19,11 +19,13 @@ add_executable(${project_name}
 
 ## link libs
 
-find_package(oatpp 0.19.9 REQUIRED)
+find_package(oatpp 0.19.12 REQUIRED)
+find_package(mimalloc 1.0 REQUIRED)
 
 target_link_libraries(${project_name}
         PUBLIC oatpp::oatpp
         PUBLIC oatpp::oatpp-test
+        PUBLIC mimalloc-static
 )
 
 set_target_properties(${project_name} PROPERTIES