From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
Date: Mon, 13 Apr 2020 14:59:30 +0000 (+0200)
Subject: Unify include file handling (#190)
X-Git-Tag: archive/raspbian/2.11.3-2+rpi1^2~10^2~1^2~56
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b5211c88af605c4572f72c1ed103e834aa0e7618;p=utf8proc.git

Unify include file handling (#190)

The cmake file expects the parent folder to be named "utf8proc",
otherwise the target_include_directories won't work, as it references
an unknown path.

This deviates from the install targets (both cmake and makefile) in
putting the include file into a subfolder in contrast to the top level
folder. This also prevents using the library with the recent cmake
addition of FetchContent.

This change unifies the include file handling by using the local path
for cmake as well.

This might break existing uses. As a workaround, we could add a dummy
include file in the old location (new utf8proc subfolder). I'm not sure
if that is necessary.

Co-authored-by: Stefan Floeren <stefan-floeren@users.noreply.github.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c5649e..430b26d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library (utf8proc
 )
 
 # expose header path, for when this is part of a larger cmake project
-target_include_directories(utf8proc PUBLIC ../utf8proc)
+target_include_directories(utf8proc PUBLIC .)
 
 if (BUILD_SHARED_LIBS)
   # Building shared library