From 34f81d89d627fe8ec16a56442c37209bd808ec11 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 13 Jan 2018 19:03:10 +0100 Subject: [PATCH] fixed CMakeLists --- CMakeLists.txt | 19 +++---------------- README.md | 1 + src/version.hpp.in | 2 -- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17ec440..4467562 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,23 +3,10 @@ project (mastodon-cpp VERSION 0.1.1 LANGUAGES CXX ) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall") -# Write SHA1 hash and date of current git commit to a header file. Also version. -find_package(Git) -if(Git_FOUND) - # force regeneration of version.hpp on each build - file(REMOVE "${PROJECT_BINARY_DIR}/version.hpp") - execute_process(COMMAND "${GIT_EXECUTABLE}" describe --always --abbrev=0 --dirty - WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" - OUTPUT_VARIABLE GIT_SHA1 - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND "${GIT_EXECUTABLE}" log -1 --format=%aI --date=iso-strict - WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" - OUTPUT_VARIABLE GIT_DATE - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -endif() +# Write version in header include_directories(${MY_SOURCE_DIR}/src) configure_file ( "${PROJECT_SOURCE_DIR}/src/version.hpp.in" @@ -39,7 +26,7 @@ set_target_properties(mastodon-cpp PROPERTIES ) install(TARGETS mastodon-cpp DESTINATION lib) target_link_libraries(mastodon-cpp boost_system ssl crypto) -install(FILES ${PROJECT_SOURCE_DIR}/src/lib/mastodon-cpp.hpp DESTINATION include) +install(FILES ${PROJECT_SOURCE_DIR}/src/mastodon-cpp.hpp DESTINATION include) # Example client if(NOT LIB_ONLY) diff --git a/README.md b/README.md index e315f29..be54cde 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ If you use a debug build, you get more verbose error messages. * [ ] Implement all DELETE calls * Version 0.3.0 * [ ] Handle HTTP statuses 301 & 302 + * [ ] Support registering as an application * Later * [ ] Escape user input * [ ] Asynchronous I/O diff --git a/src/version.hpp.in b/src/version.hpp.in index b5e35eb..732c08f 100644 --- a/src/version.hpp.in +++ b/src/version.hpp.in @@ -6,8 +6,6 @@ namespace Mastodon namespace global { static constexpr char version[] = "@PROJECT_VERSION@"; - static constexpr char git_sha1[] ="@GIT_SHA1@"; - static constexpr char git_date[] ="@GIT_DATE@"; } }