From 44f4198b0d8076203f7247d3183037d5179b11d0 Mon Sep 17 00:00:00 2001
From: Stefan Huber <shuber@sthu.org>
Date: Thu, 27 Nov 2014 00:25:13 +0100
Subject: [PATCH] pkg: remove version from include/libstick-0.1/
Having the version number explicitly in the source tree in
include/libstick-0.1 is bad: We do not want to change include directives
when we change the version, but we only want to change PACKAGE_VERSION.
Also, we want to avoid name clashes for header filenames. Hence, we put
the headers in a subdir libstick/ in include/ and install libstick/ to
include/libstick-${PACKAGE_VERSION}/, which is returned by pkg-config
for cflags.
---
include/CMakeLists.txt | 2 +-
include/{libstick-0.1 => libstick}/booleanmatrix.h | 0
include/{libstick-0.1 => libstick}/booleanvector.h | 0
include/{libstick-0.1 => libstick}/image.h | 0
include/{libstick-0.1 => libstick}/persistence.h | 0
include/{libstick-0.1 => libstick}/simplicialcomplex.h | 0
tests/booleanmatrix.h | 2 +-
tests/booleanvector.h | 2 +-
tests/image.h | 2 +-
tests/persistence.h | 2 +-
tests/simplicialcomplex.h | 2 +-
11 files changed, 6 insertions(+), 6 deletions(-)
rename include/{libstick-0.1 => libstick}/booleanmatrix.h (100%)
rename include/{libstick-0.1 => libstick}/booleanvector.h (100%)
rename include/{libstick-0.1 => libstick}/image.h (100%)
rename include/{libstick-0.1 => libstick}/persistence.h (100%)
rename include/{libstick-0.1 => libstick}/simplicialcomplex.h (100%)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index caf6524..abe8362 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1 +1 @@
-install (DIRECTORY ./ DESTINATION include FILES_MATCHING PATTERN "*.h")
+install (DIRECTORY ./ DESTINATION include/libstick-${PACKAGE_VERSION} FILES_MATCHING PATTERN "*.h")
diff --git a/include/libstick-0.1/booleanmatrix.h b/include/libstick/booleanmatrix.h
similarity index 100%
rename from include/libstick-0.1/booleanmatrix.h
rename to include/libstick/booleanmatrix.h
diff --git a/include/libstick-0.1/booleanvector.h b/include/libstick/booleanvector.h
similarity index 100%
rename from include/libstick-0.1/booleanvector.h
rename to include/libstick/booleanvector.h
diff --git a/include/libstick-0.1/image.h b/include/libstick/image.h
similarity index 100%
rename from include/libstick-0.1/image.h
rename to include/libstick/image.h
diff --git a/include/libstick-0.1/persistence.h b/include/libstick/persistence.h
similarity index 100%
rename from include/libstick-0.1/persistence.h
rename to include/libstick/persistence.h
diff --git a/include/libstick-0.1/simplicialcomplex.h b/include/libstick/simplicialcomplex.h
similarity index 100%
rename from include/libstick-0.1/simplicialcomplex.h
rename to include/libstick/simplicialcomplex.h
diff --git a/tests/booleanmatrix.h b/tests/booleanmatrix.h
index 9e33ee0..8ab7127 100644
--- a/tests/booleanmatrix.h
+++ b/tests/booleanmatrix.h
@@ -4,7 +4,7 @@
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick-0.1/booleanmatrix.h>
+#include <libstick/booleanmatrix.h>
using namespace libstick;
diff --git a/tests/booleanvector.h b/tests/booleanvector.h
index ebf6b9f..c1ba829 100644
--- a/tests/booleanvector.h
+++ b/tests/booleanvector.h
@@ -4,7 +4,7 @@
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick-0.1/booleanvector.h>
+#include <libstick/booleanvector.h>
using namespace libstick;
diff --git a/tests/image.h b/tests/image.h
index 8633a56..a4d7149 100644
--- a/tests/image.h
+++ b/tests/image.h
@@ -4,7 +4,7 @@
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick-0.1/image.h>
+#include <libstick/image.h>
#include <cassert>
#include <math.h>
diff --git a/tests/persistence.h b/tests/persistence.h
index 4412d33..1028810 100644
--- a/tests/persistence.h
+++ b/tests/persistence.h
@@ -4,7 +4,7 @@
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick-0.1/persistence.h>
+#include <libstick/persistence.h>
using namespace libstick;
diff --git a/tests/simplicialcomplex.h b/tests/simplicialcomplex.h
index 6cab051..da0dfb5 100644
--- a/tests/simplicialcomplex.h
+++ b/tests/simplicialcomplex.h
@@ -4,7 +4,7 @@
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick-0.1/simplicialcomplex.h>
+#include <libstick/simplicialfunction.h>
using namespace libstick;
--
2.39.5