diff --git a/snappy.pc.in b/snappy.pc.in new file mode 100644 index 0000000000..9e87e2c740 --- /dev/null +++ b/snappy.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/include + +Name: snappy +Description: Fast compressor/decompressor library. +Version: @PROJECT_VERSION@ +Libs: -L${libdir} -lsnappy +Cflags: -I${includedir} diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,6 +225,12 @@ "${PROJECT_BINARY_DIR}/config.h" ) +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/snappy.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/snappy.pc" + @ONLY +) + # We don't want to define HAVE_ macros in public headers. Instead, we use # CMake's variable substitution with 0/1 variables, which will be seen by the # preprocessor as constants. @@ -395,4 +401,8 @@ "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" ) + install( + FILES "${PROJECT_BINARY_DIR}/snappy.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) endif(SNAPPY_INSTALL) diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -308,7 +308,7 @@ if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) set_target_properties(snappy_test_support PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) endif(BUILD_SHARED_LIBS) - target_link_libraries(snappy_test_support snappy) + target_link_libraries(snappy_test_support snappy gtest_main gtest) if(HAVE_LIBZ) target_link_libraries(snappy_test_support z) @@ -335,19 +335,18 @@ set(install_gmock OFF) set(build_gmock ON) - # This project is tested using GoogleTest. - add_subdirectory("third_party/googletest") + find_package(GTest REQUIRED) # GoogleTest triggers a missing field initializers warning. if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) - set_property(TARGET gtest + set_property(TARGET GTest::gtest APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) - set_property(TARGET gmock + set_property(TARGET GTest::gmock APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS) if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION) - set_property(TARGET gtest + set_property(TARGET GTest::gtest APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion) endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)