Author: brane Date: Sun Jun 24 13:04:00 2018 New Revision: 1834249 URL: http://svn.apache.org/viewvc?rev=1834249&view=rev Log: Continue working on the CMake build.
* CMakeLists.txt (SOURCES): Explicitly list all source files. * test/CMakeLists.txt: New; module for unit tests. Added: serf/trunk/test/CMakeLists.txt (with props) Modified: serf/trunk/CMakeLists.txt Modified: serf/trunk/CMakeLists.txt URL: http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1834249&r1=1834248&r2=1834249&view=diff ============================================================================== --- serf/trunk/CMakeLists.txt (original) +++ serf/trunk/CMakeLists.txt Sun Jun 24 13:04:00 2018 @@ -35,11 +35,58 @@ set(HEADERS "serf_bucket_util.h" ) -file(GLOB SOURCES "src/*.c" "auth/*.c" "buckets/*.c" "protocols/*.c") +set(SOURCES + "src/config_store.c" + "src/context.c" + "src/deprecated.c" + "src/incoming.c" + "src/logging.c" + "src/outgoing.c" + "src/outgoing_request.c" + "src/pump.c" + "src/ssltunnel.c" + "auth/auth.c" + "auth/auth_basic.c" + "auth/auth_digest.c" + "auth/auth_spnego.c" + "auth/auth_spnego_gss.c" + "auth/auth_spnego_sspi.c" + "buckets/aggregate_buckets.c" + "buckets/allocator.c" + "buckets/barrier_buckets.c" + "buckets/brotli_buckets.c" + "buckets/buckets.c" + "buckets/bwtp_buckets.c" + "buckets/chunk_buckets.c" + "buckets/copy_buckets.c" + "buckets/dechunk_buckets.c" + "buckets/deflate_buckets.c" + "buckets/event_buckets.c" + "buckets/fcgi_buckets.c" + "buckets/file_buckets.c" + "buckets/headers_buckets.c" + "buckets/hpack_buckets.c" + "buckets/http2_frame_buckets.c" + "buckets/iovec_buckets.c" + "buckets/limit_buckets.c" + "buckets/log_wrapper_buckets.c" + "buckets/mmap_buckets.c" + "buckets/prefix_buckets.c" + "buckets/request_buckets.c" + "buckets/response_body_buckets.c" + "buckets/response_buckets.c" + "buckets/simple_buckets.c" + "buckets/socket_buckets.c" + "buckets/split_buckets.c" + "buckets/ssl_buckets.c" + "protocols/fcgi_protocol.c" + "protocols/fcgi_stream.c" + "protocols/http2_protocol.c" + "protocols/http2_stream.c" +) + if(WINDOWS) set(SHARED_SOURCES "serf.rc") -else(WINDOWS) - set(SHARED_SOURCES) endif(WINDOWS) @@ -90,3 +137,5 @@ set_target_properties(SerfStatic SerfSha OUTPUT_NAME "serf-${SERF_MAJOR_VERSION}" VERSION ${SERF_VERSION} SOVERSION ${SERF_SOVERSION}) + +add_subdirectory(test) Added: serf/trunk/test/CMakeLists.txt URL: http://svn.apache.org/viewvc/serf/trunk/test/CMakeLists.txt?rev=1834249&view=auto ============================================================================== --- serf/trunk/test/CMakeLists.txt (added) +++ serf/trunk/test/CMakeLists.txt Sun Jun 24 13:04:00 2018 @@ -0,0 +1,41 @@ +# =================================================================== +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# =================================================================== + + +set(TEST_ALL_SOURCES + "test_all.c" + "CuTest.c" + "test_util.c" + "test_context.c" + "test_buckets.c" + "test_auth.c" + "test_internal.c" + "test_server.c" + "mock_buckets.c" + "mock_sock_buckets.c" + "test_ssl.c" + "MockHTTPinC/MockHTTP.c" + "MockHTTPinC/MockHTTP_server.c" +) + +add_definitions("-DMOCKHTTP_OPENSSL") +add_executable(test_all ${TEST_ALL_SOURCES}) +add_dependencies(test_all SerfStatic) +target_link_libraries(test_all SerfStatic ${DEPENDENCY_LIBRARIES}) +add_test(NAME test_all COMMAND test_all) Propchange: serf/trunk/test/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native