shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* CMakeLists.txt: Always create `ftconfig.h'.

For non-UNIX builds, the file stays unmodified.  However, it's
better to have the main configuration files at the same place
regardless of the OS.

git/fs: mount .git/fs: mount/attach disallowed

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -156,14 +156,14 @@

 # Create the configuration file

+message(STATUS

+  "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h")

+

 if (UNIX)

   check_include_file("unistd.h" HAVE_UNISTD_H)

   check_include_file("fcntl.h" HAVE_FCNTL_H)

   check_include_file("stdint.h" HAVE_STDINT_H)

-  message(STATUS

-    "Creating file ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h")

-

   file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in"

     FTCONFIG_H)

   if (HAVE_UNISTD_H)

@@ -185,6 +185,11 @@

     FTCONFIG_H "${FTCONFIG_H}")

   file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"

     "${FTCONFIG_H}")

+else ()

+  file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h"

+    FTCONFIG_H)

+  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"

+    "${FTCONFIG_H}")

 endif ()

@@ -341,8 +346,11 @@

   DESTINATION include/freetype2

   PATTERN "internal" EXCLUDE

   PATTERN "ftconfig.h" EXCLUDE

+  PATTERN "ftoption.h" EXCLUDE

 )

-install(FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h

+install(FILES

+  ${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h

+  ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h

   DESTINATION include/freetype2/freetype/config

 )

 install(TARGETS freetype

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,13 @@

 2015-06-28  Werner Lemberg  <[email protected]>

+	* CMakeLists.txt: Always create `ftconfig.h'.

+

+	For non-UNIX builds, the file stays unmodified.  However, it's

+	better to have the main configuration files at the same place

+	regardless of the OS.

+

+2015-06-28  Werner Lemberg  <[email protected]>

+

 	* CMakeLists.txt: Improve MSVC support (#43737).

 2015-06-28  Werner Lemberg  <[email protected]>