Author: brane
Date: Mon Jun 25 04:35:10 2018
New Revision: 1834276
URL: http://svn.apache.org/viewvc?rev=1834276&view=rev
Log:
More CMake build.
* CMakeLists.txt, test/CMakeLists.txt: Minor tweaks for consistency.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/test/CMakeLists.txt
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1834276&r1=1834275&r2=1834276&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Mon Jun 25 04:35:10 2018
@@ -134,14 +134,16 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${AP
include_directories(BEFORE SYSTEM ${DEPENDENCY_INCLUDES})
include_directories(${CMAKE_SOURCE_DIR})
-add_library(SerfStatic STATIC ${SOURCES})
-add_library(SerfShared SHARED ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(SerfShared ${DEPENDENCY_LIBRARIES})
-set_target_properties(SerfStatic SerfShared
+
+add_library(serf SHARED ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(serf ${DEPENDENCY_LIBRARIES})
+
+add_library(serf_static STATIC ${SOURCES})
+
+set_target_properties(serf serf_static
PROPERTIES
OUTPUT_NAME "serf-${SERF_MAJOR_VERSION}"
VERSION ${SERF_VERSION}
SOVERSION ${SERF_SOVERSION})
-set(SERF_SOURCE_DIR ${CMAKE_SOURCE_DIR})
add_subdirectory(test)
Modified: serf/trunk/test/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/test/CMakeLists.txt?rev=1834276&r1=1834275&r2=1834276&view=diff
==============================================================================
--- serf/trunk/test/CMakeLists.txt (original)
+++ serf/trunk/test/CMakeLists.txt Mon Jun 25 04:35:10 2018
@@ -47,22 +47,22 @@ add_definitions("-DMOCKHTTP_OPENSSL")
foreach(TEST_TARGET ${SIMPLE_TEST_TARGETS})
add_executable(${TEST_TARGET} "${TEST_TARGET}.c")
- add_dependencies(${TEST_TARGET} SerfStatic)
- target_link_libraries(${TEST_TARGET} SerfStatic ${DEPENDENCY_LIBRARIES})
+ add_dependencies(${TEST_TARGET} serf_static)
+ target_link_libraries(${TEST_TARGET} serf_static ${DEPENDENCY_LIBRARIES})
endforeach()
add_executable(test_all ${TEST_ALL_SOURCES})
-add_dependencies(test_all SerfStatic)
-target_link_libraries(test_all SerfStatic ${DEPENDENCY_LIBRARIES})
+add_dependencies(test_all serf_static)
+target_link_libraries(test_all serf_static ${DEPENDENCY_LIBRARIES})
file(GLOB RESPONSE_TEST_CASES
"${CMAKE_CURRENT_SOURCE_DIR}/testcases/*.response")
foreach(TEST_CASE ${RESPONSE_TEST_CASES})
get_filename_component(TEST_CASE_NAME ${TEST_CASE} NAME)
add_test(NAME "${TEST_CASE_NAME}" COMMAND serf_response "${TEST_CASE}")
- list(APPEND RESPONS_TESTS "${TEST_CASE_NAME}")
+ list(APPEND RESPONSE_TESTS "${TEST_CASE_NAME}")
endforeach()
add_test(NAME test_all COMMAND test_all)
-set_tests_properties(${RESPONS_TESTS} test_all PROPERTIES
- ENVIRONMENT srcdir=${SERF_SOURCE_DIR})
+set_tests_properties(${RESPONSE_TESTS} test_all PROPERTIES
+ ENVIRONMENT srcdir=${CMAKE_SOURCE_DIR})
