schtobia/ModernCppStarter
1
0
Fork 0
mirror of https://github.com/TheLartians/ModernCppStarter.git synced 2025-10-31 02:01:33 +01:00
Code Issues Activity

move includes into project directory and create version header

Browse source
This commit is contained in:
Lars Melchior 2020-06-03 16:15:11 +02:00
parent 47f89bf102
commit 81fdc61cb1
6 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -23,7 +23,7 @@ include(cmake/CPM.cmake)
CPMAddPackage( CPMAddPackage(
NAME PackageProject.cmake NAME PackageProject.cmake
GITHUB_REPOSITORY TheLartians/PackageProject.cmake GITHUB_REPOSITORY TheLartians/PackageProject.cmake
VERSION 1.2.1 VERSION 1.3
) )
# ---- Add source files ---- # ---- Add source files ----
@ -58,11 +58,14 @@ target_include_directories(Greeter
# ---- Create an installable target ---- # ---- Create an installable target ----
# this allows users to install and find the library via `find_package()`. # this allows users to install and find the library via `find_package()`.
string(TOLOWER ${PROJECT_NAME} LOWERCASE_PROJECT_NAME)
packageProject( packageProject(
NAME ${PROJECT_NAME} NAME ${PROJECT_NAME}
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
BINARY_DIR ${PROJECT_BINARY_DIR} BINARY_DIR ${PROJECT_BINARY_DIR}
INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include
INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION} INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
VERSION_HEADER "${LOWERCASE_PROJECT_NAME}/version.h"
DEPENDENCIES "" DEPENDENCIES ""
) )

0
include/greeter.h → include/greeter/greeter.h
View file

2
source/greeter.cpp
View file

@ -1,4 +1,4 @@
#include <greeter.h> #include <greeter/greeter.h>
using namespace greeter; using namespace greeter;

1
standalone/CMakeLists.txt
View file

@ -38,4 +38,3 @@ set_target_properties(GreeterStandalone PROPERTIES
) )
target_link_libraries(GreeterStandalone Greeter cxxopts) target_link_libraries(GreeterStandalone Greeter cxxopts)
target_compile_definitions(GreeterStandalone PRIVATE -DGREETER_VERSION=\"${Greeter_VERSION}\")

3
standalone/source/main.cpp
View file

@ -1,4 +1,5 @@
#include <greeter.h> #include <greeter/greeter.h>
#include <greeter/version.h>
#include <cxxopts.hpp> #include <cxxopts.hpp>
#include <iostream> #include <iostream>

11
test/source/greeter.cpp
View file

@ -1,5 +1,9 @@
#include <doctest/doctest.h> #include <doctest/doctest.h>
#include <greeter.h>
#include <greeter/greeter.h>
#include <greeter/version.h>
#include <string>
TEST_CASE("Greeter") { TEST_CASE("Greeter") {
using namespace greeter; using namespace greeter;
@ -11,3 +15,8 @@ TEST_CASE("Greeter") {
CHECK(greeter.greet(LanguageCode::ES) == "¡Hola Tests!"); CHECK(greeter.greet(LanguageCode::ES) == "¡Hola Tests!");
CHECK(greeter.greet(LanguageCode::FR) == "Bonjour Tests!"); CHECK(greeter.greet(LanguageCode::FR) == "Bonjour Tests!");
} }
TEST_CASE("Greeter version") {
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0"));
CHECK(std::string(GREETER_VERSION) == std::string("1.0"));
}