From a1083b5c186347b77ea577af9fc47f5a56feb457 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 14 Apr 2019 04:38:59 +0200 Subject: [PATCH] Changed CMAKE_PROJECT_NAME to PROJECT_NAME. --- CMakeLists.txt | 26 +++++++++++++------------- packages.CMakeLists.txt | 12 ++++++------ tests.CMakeLists.txt | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9483c1..f9d01c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,17 +67,17 @@ if(WITH_EASY) else() file(GLOB sources src/*.cpp src/api/*.cpp) endif() -add_library(${CMAKE_PROJECT_NAME} SHARED ${sources}) -set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES +add_library(${PROJECT_NAME} SHARED ${sources}) +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION} - SOVERSION ${${CMAKE_PROJECT_NAME}_VERSION_MAJOR} + SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR} ) if(WITH_EASY) - target_link_libraries(${CMAKE_PROJECT_NAME} + target_link_libraries(${PROJECT_NAME} ${CURLPP_LIBRARIES} pthread ${JSONCPP_LIBRARIES}) else() - target_link_libraries(${CMAKE_PROJECT_NAME} + target_link_libraries(${PROJECT_NAME} ${CURLPP_LIBRARIES} pthread) endif() @@ -87,7 +87,7 @@ if(WITH_EXAMPLES) foreach(src ${sources_examples}) get_filename_component(bin ${src} NAME_WE) add_executable(${bin} ${src}) - target_link_libraries(${bin} pthread ${JSONCPP_LIBRARIES} ${CMAKE_PROJECT_NAME}) + target_link_libraries(${bin} pthread ${JSONCPP_LIBRARIES} ${PROJECT_NAME}) endforeach() endif() @@ -97,17 +97,17 @@ if(WITH_TESTS) endif() # Install library and header files -install(TARGETS ${CMAKE_PROJECT_NAME} LIBRARY +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES src/mastodon-cpp.hpp src/return_types.hpp src/types.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) if(WITH_EASY) file(GLOB easy_header src/easy/*.hpp) install(FILES ${easy_header} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}/easy) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy) file(GLOB easy_entities_header src/easy/entities/*.hpp) install(FILES ${easy_entities_header} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}/easy/entities) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/easy/entities) endif() # Compile & install documentation @@ -115,12 +115,12 @@ if(WITH_DOC) add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/doc/html COMMAND ./build_doc.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) add_custom_target(doc DEPENDS doc/html) - add_dependencies(${CMAKE_PROJECT_NAME} doc) + add_dependencies(${PROJECT_NAME} doc) install(DIRECTORY ${PROJECT_SOURCE_DIR}/doc/html - DESTINATION ${CMAKE_INSTALL_DOCDIR}/${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}) + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}-${PROJECT_VERSION}) file(GLOB examples examples/example*.cpp) install(FILES ${examples} - DESTINATION ${CMAKE_INSTALL_DOCDIR}/${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}/examples) + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}-${PROJECT_VERSION}/examples) endif() # Packages diff --git a/packages.CMakeLists.txt b/packages.CMakeLists.txt index 65bfb3b..e4c223a 100644 --- a/packages.CMakeLists.txt +++ b/packages.CMakeLists.txt @@ -1,7 +1,7 @@ -set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -set(CPACK_PACKAGE_VERSION_MAJOR ${mastodon-cpp_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${mastodon-cpp_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${mastodon-cpp_VERSION_PATCH}) +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) +set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION ${mastodon-cpp_VERSION}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ wrapper for the Mastodon API") set(CPACK_PACKAGE_CONTACT "tastytea ") @@ -24,7 +24,7 @@ set(CPACK_GENERATOR "TGZ") set(CPACK_SOURCE_GENERATOR "TGZ") if (WITH_DEB) - set(CPACK_PACKAGE_NAME "lib${CMAKE_PROJECT_NAME}") + set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}") set(CPACK_GENERATOR "DEB") set(CPACK_SOURCE_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://schlomp.space/tastytea/mastodon-cpp") @@ -39,7 +39,7 @@ if (WITH_DEB) endif() if (WITH_RPM) - set(CPACK_PACKAGE_NAME "lib${CMAKE_PROJECT_NAME}") + set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}") set(CPACK_GENERATOR "RPM") set(CPACK_SOURCE_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_LICENSE "GPL-3") diff --git a/tests.CMakeLists.txt b/tests.CMakeLists.txt index d10ed64..673a310 100644 --- a/tests.CMakeLists.txt +++ b/tests.CMakeLists.txt @@ -5,7 +5,7 @@ find_package(Catch2) if(Catch2_FOUND) # Catch 2.x include(Catch) add_executable(all_tests tests/main.cpp ${sources_tests}) - target_link_libraries(all_tests ${CMAKE_PROJECT_NAME} Catch2::Catch2) + target_link_libraries(all_tests ${PROJECT_NAME} Catch2::Catch2) target_include_directories(all_tests PRIVATE "/usr/include/catch2") catch_discover_tests(all_tests) else() # Catch 1.x @@ -14,7 +14,7 @@ else() # Catch 1.x foreach(src ${sources_tests}) get_filename_component(bin ${src} NAME_WE) add_executable(${bin} tests/main.cpp ${src}) - target_link_libraries(${bin} ${CMAKE_PROJECT_NAME}) + target_link_libraries(${bin} ${PROJECT_NAME}) add_test(${bin} ${bin}) endforeach() else()