Fix conflicts

Author: mmd-osm

src/CMakeLists.txt

@@ -16,7 +16,6 @@ target_sources(cgimap_core PRIVATE
     logger.cpp
     mime_types.cpp
     basicauth.cpp
-    oauth.cpp
     oauth2.cpp
     options.cpp
     osm_responder.cpp

src/backend/apidb/CMakeLists.txt

@@ -14,7 +14,6 @@ if(ENABLE_APIDB)
         pgsql_update.cpp
         changeset.cpp
         quad_tile.cpp
-        oauth_store.cpp
         transaction_manager.cpp
         utils.cpp
         changeset_upload/changeset_updater.cpp

test/CMakeLists.txt

@@ -76,22 +76,6 @@ if(BUILD_TESTING)
         COMMAND test_basicauth)
 
 
-    ###########
-    # test_oauth
-    ###########
-    add_executable(test_oauth
-        test_oauth.cpp)
-
-    target_link_libraries(test_oauth
-        cgimap_common_compiler_options
-        cgimap_core
-        Boost::program_options
-        PQXX::PQXX)
-
-    add_test(NAME test_oauth
-        COMMAND test_oauth)
-
-
     ###########
     # test_oauth2
     ###########
@@ -196,26 +180,6 @@ if(BUILD_TESTING)
             COMMAND pg_virtualenv "$<TARGET_FILE:test_apidb_backend_nodes>" --db-schema "${CMAKE_CURRENT_SOURCE_DIR}/structure.sql")
 
 
-        ##########################
-        # test_apidb_backend_oauth
-        ##########################
-        add_executable(test_apidb_backend_oauth
-            test_apidb_backend_oauth.cpp
-            test_formatter.cpp
-            test_database.cpp
-            test_request.cpp)
-
-        target_link_libraries(test_apidb_backend_oauth
-            cgimap_common_compiler_options
-            cgimap_core
-            cgimap_apidb
-            cgimap_staticxml
-            Boost::program_options)
-
-        add_test(NAME test_apidb_backend_oauth
-            COMMAND pg_virtualenv "$<TARGET_FILE:test_apidb_backend_oauth>" --db-schema "${CMAKE_CURRENT_SOURCE_DIR}/structure.sql")
-
-
         ###########################
         # test_apidb_backend_oauth2
         ###########################