From cc43f133a4369391364b96c78c11c68606fa13f0 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 3 Mar 2019 12:28:14 +0100 Subject: [PATCH] Removed -DWITH_STATIC. --- CMakeLists.txt | 10 ---------- README.md | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a689ade..f955ca1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,12 +72,6 @@ else() target_link_libraries(mastodon-cpp ${CURLPP_LIBRARIES} ${JSONCPP_LIBRARIES}) endif() -if(WITH_STATIC) - add_library(mastodon-cpp_static STATIC ${sources}) - set_target_properties(mastodon-cpp_static PROPERTIES - OUTPUT_NAME mastodon-cpp) -endif() - # Compile examples if(WITH_EXAMPLES) file(GLOB sources_examples examples/*.cpp) @@ -102,10 +96,6 @@ endif() # Install library and header files install(TARGETS mastodon-cpp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -if(WITH_STATIC) - install(TARGETS mastodon-cpp_static LIBRARY - DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() install(FILES src/mastodon-cpp.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mastodon-cpp) if(NOT WITHOUT_EASY) diff --git a/README.md b/README.md index 6456b25..4c86011 100644 --- a/README.md +++ b/README.md @@ -162,10 +162,10 @@ cmake options: * `-DWITHOUT_EASY=ON` to not build the Easy abstractions and to get rid of the jsoncpp-dependency (not recommended) * `-DWITH_EXAMPLES=ON` if you want to compile the examples * `-DWITH_TESTS=ON` if you want to compile the tests - * `-DWITH_STATIC=ON` If you want a static library along with the dynamic one * `-DWITH_DOC=ON` if you want to compile the HTML reference - * `-DWITH_DEB=ON` if you want to be able to generate a deb-package - * `-DWITH_RPM=ON` if you want to be able to generate an rpm-package + * One of: + * `-DWITH_DEB=ON` if you want to be able to generate a deb-package + * `-DWITH_RPM=ON` if you want to be able to generate an rpm-package You can run the tests with `ctest ..` inside the build directory. To install, run `make install`.