restructure example projects

Author: lganzzzo

CMakeLists.txt

@@ -2,38 +2,47 @@ cmake_minimum_required(VERSION 3.1)
 
 set(project_name example-async-api) ## rename your project here
 
-project(${project_name}-loader)
+project(${project_name})
 
-include(ExternalProject)
+set(CMAKE_CXX_STANDARD 11)
 
-#############################################################################
-## load all dependencies
-
-ExternalProject_Add(oatpp
-        GIT_REPOSITORY "https://github.com/oatpp/oatpp.git"
-        GIT_TAG origin/master
-        CMAKE_ARGS -DOATPP_BUILD_TESTS=OFF
+add_library(${project_name}-lib
+        src/AppComponent.hpp
+        src/controller/MyController.cpp
+        src/controller/MyController.hpp
+        src/dto/MyDTOs.hpp
 )
 
-ExternalProject_Add(main
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/main
-        INSTALL_COMMAND cmake -E echo "SKIP INSTALL"
-        DEPENDS oatpp
+## link libs
+
+find_package(oatpp 0.19.4 REQUIRED)
+
+target_link_libraries(${project_name}-lib
+        PUBLIC oatpp::oatpp
+        PUBLIC oatpp::oatpp-test
 )
 
-#############################################################################
-## make run command
+target_include_directories(${project_name}-lib PUBLIC src)
 
-ExternalProject_Get_Property(main BINARY_DIR)
+## add executables
 
-add_custom_target(run
-        COMMAND ${BINARY_DIR}/${project_name}-exe
-        DEPENDS main
-        WORKING_DIRECTORY ${BINARY_DIR}
+add_executable(${project_name}-exe
+        src/App.cpp
 )
+target_link_libraries(${project_name}-exe ${project_name}-lib)
+add_dependencies(${project_name}-exe ${project_name}-lib)
 
-#############################################################################
-## make test command
+add_executable(${project_name}-test
+        test/tests.cpp
+)
+target_link_libraries(${project_name}-test ${project_name}-lib)
+add_dependencies(${project_name}-test ${project_name}-lib)
+
+set_target_properties(${project_name}-lib ${project_name}-exe ${project_name}-test PROPERTIES
+        CXX_STANDARD 11
+        CXX_EXTENSIONS OFF
+        CXX_STANDARD_REQUIRED ON
+)
 
 enable_testing()
-add_test(all-tests ${BINARY_DIR}/${project_name}-test)
+add_test(project-tests ${project_name}-test)

Dockerfile

@@ -2,11 +2,15 @@ FROM lganzzzo/alpine-cmake:latest
 
 ADD . /service
 
+WORKDIR /service/utility
+
+RUN ./install-oatpp-modules.sh
+
 WORKDIR /service/build
 
 RUN cmake ..
 RUN make
 
 EXPOSE 8000 8000
 
-ENTRYPOINT ["make", "run"]
+ENTRYPOINT ["./example-async-api-exe"]

README.md

@@ -12,23 +12,17 @@ Example project how-to use oatpp asynchronous API.
 ### Project layout
 
 ```
-
-- CMakeLists.txt               // project loader script. load and build dependencies 
-- main/                        // main project directory
-    |
-    |- CMakeLists.txt          // projects CMakeLists.txt
-    |- src/                    // source folder
-    |- test/                   // test folder
-    
-```
-```
+- CMakeLists.txt                        // projects CMakeLists.txt
 - src/
     |
-    |- controller/              // Folder containing controller where all endpoints are declared
-    |- dto/                     // DTOs are declared here
-    |- AppComponent.hpp         // Service config
-    |- Logger.hpp               // Application Logger
-    |- App.cpp                  // main() is here
+    |- controller/                      // Folder containing controller where all endpoints are declared
+    |- dto/                             // DTOs are declared here
+    |- AppComponent.hpp                 // Service config
+    |- Logger.hpp                       // Application Logger
+    |- App.cpp                          // main() is here
+
+- test/                                 // test folder
+- utility/install-oatpp-modules.sh      // utility script to install required oatpp-modules.
     
 ```
 
@@ -38,10 +32,16 @@ Example project how-to use oatpp asynchronous API.
 
 #### Using CMake
 
+**Requires**
+
+- `oatpp` module installed. You may run `utility/install-oatpp-modules.sh` 
+script to install required oatpp modules.
+
 ```
 $ mkdir build && cd build
 $ cmake ..
-$ make run        ## Download, build, and install all dependencies. Run project
+$ make 
+$ ./example-async-api-exe  # - run application.
 
 ```
 

azure-pipelines.yml

@@ -14,6 +14,10 @@ jobs:
     workspace:
       clean: all
     steps:
+      - script: |
+          sudo ./install-oatpp-modules.sh
+        displayName: 'install oatpp modules'
+        workingDirectory: utility
       - script: |
           mkdir build
       - script: |
@@ -24,4 +28,4 @@ jobs:
       - script: |
           make test ARGS="-V"
         displayName: 'Test'
-        workingDirectory: build
+        workingDirectory: build