[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 8f982b3: CMakeLists.txt: Honour new command line flag
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 8f982b3: CMakeLists.txt: Honour new command line flag `FREETYPE_NO_DIST'. |
Date: |
Fri, 27 Nov 2015 05:35:04 +0000 |
branch: master
commit 8f982b388168f7945e65c7a75e4dec5f167cb42d
Author: Alexander Bock <address@hidden>
Commit: Werner Lemberg <address@hidden>
CMakeLists.txt: Honour new command line flag `FREETYPE_NO_DIST'.
---
CMakeLists.txt | 10 +++++++---
ChangeLog | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a96ef6..1577b9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,9 @@
#
# . `CMakeLists.txt' is provided as-is since it is normally not used by the
# developer team.
+#
+# . If you want to disable the automatic generation of the distribution
+# targets, add the `-D FREETYPE_NO_DIST=true' command line argument.
cmake_minimum_required(VERSION 2.6)
@@ -391,8 +394,9 @@ set(CPACK_GENERATOR TGZ)
include(CPack)
-# add make dist target
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-
+# Add `make dist' target if FREETYPE_DIST is set (which is the default)
+if (NOT DEFINED FREETYPE_NO_DIST)
+ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+endif ()
# eof
diff --git a/ChangeLog b/ChangeLog
index a1f2128..63fad53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-27 Alexander Bock <address@hidden>
+
+ CMakeLists.txt: Honour new command line flag `FREETYPE_NO_DIST'.
+
2015-11-26 Werner Lemberg <address@hidden>
[docmaker] Allow `foo[bar]' as identifier.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 8f982b3: CMakeLists.txt: Honour new command line flag `FREETYPE_NO_DIST'.,
Werner LEMBERG <=