Commit c80620c7fe1c11a4a6080cdec10c09ccd6a4edda
2015-11-27T18:37:21
* CMakeLists.txt: Create `freetype-config.cmake' config module.
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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e925df..8efa08b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,22 +351,32 @@ if (BUILD_FRAMEWORK)
)
endif ()
+if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
+ target_include_directories(freetype
+ PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
+endif ()
+
+if (CMAKE_VERSION VERSION_LESS 2.8.12)
+ set(MAYBE_PRIVATE "")
+else ()
+ set(MAYBE_PRIVATE "PRIVATE")
+endif ()
if (ZLIB_FOUND)
- target_link_libraries(freetype ${ZLIB_LIBRARIES})
+ target_link_libraries(freetype ${MAYBE_PRIVATE} ${ZLIB_LIBRARIES})
include_directories(${ZLIB_INCLUDE_DIRS})
endif ()
if (BZIP2_FOUND)
- target_link_libraries(freetype ${BZIP2_LIBRARIES})
+ target_link_libraries(freetype ${MAYBE_PRIVATE} ${BZIP2_LIBRARIES})
include_directories(${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
endif ()
if (PNG_FOUND)
add_definitions(${PNG_DEFINITIONS})
- target_link_libraries(freetype ${PNG_LIBRARIES})
+ target_link_libraries(freetype ${MAYBE_PRIVATE} ${PNG_LIBRARIES})
include_directories(${PNG_INCLUDE_DIRS})
endif ()
if (HARFBUZZ_FOUND)
- target_link_libraries(freetype ${HARFBUZZ_LIBRARIES})
+ target_link_libraries(freetype ${MAYBE_PRIVATE} ${HARFBUZZ_LIBRARIES})
include_directories(${HARFBUZZ_INCLUDE_DIRS})
endif ()
@@ -385,11 +395,16 @@ install(FILES
DESTINATION include/freetype2/freetype/config
)
install(TARGETS freetype
+ EXPORT freetype-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
FRAMEWORK DESTINATION Library/Frameworks
)
+install(EXPORT freetype-targets
+ DESTINATION lib/cmake/freetype
+ FILE freetype-config.cmake
+)
# Packaging
diff --git a/ChangeLog b/ChangeLog
index fee798c..33c9637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-11-27 Tamas Kenez <tamas.kenez@adasworks.com>
+ * CMakeLists.txt: Create `freetype-config.cmake' config module.
+
+2015-11-27 Tamas Kenez <tamas.kenez@adasworks.com>
+
* CMakeLists.txt: Set CMAKE_DEBUG_POSTFIX to `d'.
2015-11-27 Tamas Kenez <tamas.kenez@adasworks.com>