Commit f7b4fb3a214c15df0579979bd1bd4e7f613f0209
2018-05-07T23:10:36
CMake: Allow using project as subfolder in other project * CMakeLists.txt: Test for CMake build directory being diffent from source directory. Provide other parts of the build system access the full include directory.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f3fef7..cfba113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF)
# Disallow in-source builds
-if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR
"In-source builds are not permitted! Make a separate folder for"
" building, e.g.,\n"
@@ -356,17 +356,17 @@ if (BUILD_SHARED_LIBS)
SOVERSION ${LIBRARY_SOVERSION})
endif ()
-target_include_directories(
- freetype BEFORE # Pick up ftconfig.h and ftoption.h generated above.
- PRIVATE "${PROJECT_BINARY_DIR}/include")
-
+# Pick up ftconfig.h and ftoption.h generated above, first.
target_include_directories(
freetype
- PRIVATE "${PROJECT_SOURCE_DIR}/include")
+ PUBLIC
+ $<INSTALL_INTERFACE:include/freetype2>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_include_directories(
- freetype
- PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
if (BUILD_FRAMEWORK)
set_property(SOURCE ${PUBLIC_CONFIG_HEADERS}
diff --git a/ChangeLog b/ChangeLog
index 2397f67..8947227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-07 Nikolaus Waxweiler <madigens@gmail.com>
+
+ CMake: Allow using project as subfolder in other project
+
+ * CMakeLists.txt: Test for CMake build directory being diffent from source
+ directory. Provide other parts of the build system access the full include
+ directory.
+
2018-05-07 Werner Lemberg <wl@gnu.org>
[build] Suppress configure's `nothing to be done' message.