diff options
| author | Adam Vandenberg | 2011-05-10 21:57:51 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2011-05-10 22:02:35 -0700 |
| commit | 5481b4cda74ac07fffbbbdd8e0a56dea5924373f (patch) | |
| tree | 419dd6fc1b85dfac3ff74e69ba6f41498b96e5fa /Library | |
| parent | 9d891c0d5e41c91d67fbcdfa470160cbdc5eb7d0 (diff) | |
| download | homebrew-5481b4cda74ac07fffbbbdd8e0a56dea5924373f.tar.bz2 | |
io: Force location of PNG include.
CMake seems to not be picking up the /usr/X11/include folder for libpng,
so hard-code it to allow compilation to work.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/io.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Library/Formula/io.rb b/Library/Formula/io.rb index 764459327..78a903152 100644 --- a/Library/Formula/io.rb +++ b/Library/Formula/io.rb @@ -7,6 +7,13 @@ class Io < Formula depends_on 'cmake' => :build depends_on 'libsgml' + # Either CMake doesn't detect OS X's png include path correctly, + # or there's an issue with io's build system; force the path in + # so we can build. + def patches + DATA + end + def install ENV.j1 mkdir 'io-build' @@ -22,3 +29,18 @@ class Io < Formula prefix.install 'license/bsd_license.txt' => 'LICENSE' end end + +__END__ +diff --git a/addons/Image/CMakeLists.txt b/addons/Image/CMakeLists.txt +index a65693d..2166f1b 100644 +--- a/addons/Image/CMakeLists.txt ++++ b/addons/Image/CMakeLists.txt +@@ -22,7 +22,7 @@ if(PNG_FOUND AND TIFF_FOUND AND JPEG_FOUND) + add_definitions(-DBUILDING_IMAGE_ADDON) + + # Additional include directories +- include_directories(${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) ++ include_directories("/usr/X11/include" ${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) + + # Generate the IoImageInit.c file. + # Argument SHOULD ALWAYS be the exact name of the addon, case is |