From 6f7b155b5700de5ed95d3f28f96aaa692b61af65 Mon Sep 17 00:00:00 2001 From: Oleg Artenii Date: Mon, 20 Nov 2017 15:21:33 +0200 Subject: [PATCH 1/3] install headers --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 667d288..013714c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required (VERSION 2.8.0) project (utf8cpp) include_directories ("${PROJECT_SOURCE_DIR}/source") +include(GNUInstallDirs) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/utfcpp/) + add_executable(smoke ${PROJECT_SOURCE_DIR}/test_drivers/smoke_test/test.cpp) add_executable(negative ${PROJECT_SOURCE_DIR}/test_drivers/negative/negative.cpp) add_executable(utf8reader ${PROJECT_SOURCE_DIR}/test_drivers/utf8reader/utf8reader.cpp) From 8fc13f5bbea039bd7802268ae5e23c0755ebf4a1 Mon Sep 17 00:00:00 2001 From: Oleg Artenii Date: Mon, 20 Nov 2017 15:22:43 +0200 Subject: [PATCH 2/3] fixed trailing slash --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 013714c..d297864 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project (utf8cpp) include_directories ("${PROJECT_SOURCE_DIR}/source") include(GNUInstallDirs) -install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/utfcpp/) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/utfcpp) add_executable(smoke ${PROJECT_SOURCE_DIR}/test_drivers/smoke_test/test.cpp) add_executable(negative ${PROJECT_SOURCE_DIR}/test_drivers/negative/negative.cpp) From 4ae2e284fe0eb598e3079a47cae7ae0b7e5bfc0b Mon Sep 17 00:00:00 2001 From: Oleg Artenii Date: Wed, 22 Nov 2017 14:49:04 +0200 Subject: [PATCH 3/3] Removed GNUInstallDirs not supported in CMake 2.8 --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d297864..2843752 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required (VERSION 2.8.0) project (utf8cpp) include_directories ("${PROJECT_SOURCE_DIR}/source") -include(GNUInstallDirs) -install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/utfcpp) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/ DESTINATION include/utfcpp) add_executable(smoke ${PROJECT_SOURCE_DIR}/test_drivers/smoke_test/test.cpp) add_executable(negative ${PROJECT_SOURCE_DIR}/test_drivers/negative/negative.cpp)