diff options
| author | José Fonseca <jfonseca@vmware.com> | 2011-07-15 16:08:50 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-15 16:08:50 +0100 |
| commit | 84e246932ed8f994c595f57a272e7d34664e509d (patch) | |
| tree | bbae5647dcdc73f60bace84e4c72a7f673f5da2e | |
| parent | c06c131d79abaea87bc97548163c5fd9ac39e119 (diff) | |
Fix MacOSX build.
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/tiff/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 217b52a..cebb8ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,7 +51,10 @@ else () endforeach (flag_var) endif () -set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext) +if (APPLE) + # We rely on frameworks which where deprecated on x86-64 + set (CMAKE_OSX_ARCHITECTURES i386) +endif () if (NOT TIFF_FOUND) set (TIFF_INCLUDE_DIR ${CMAKE_BINARY_DIR}/tiff ${CMAKE_SOURCE_DIR}/tiff) @@ -59,12 +62,13 @@ if (NOT TIFF_FOUND) add_subdirectory (tiff) endif () +set (GLEXT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/glext) + if (WIN32) add_definitions (-D__WIN__ -D__MS__) elseif (APPLE) add_definitions (-D__AGL__ -D__UNIX__) find_library (CARBON_LIBRARY Carbon) - set (CMAKE_OSX_ARCHITECTURES i386) else () add_definitions (-D__X11__ -D__UNIX__) endif () diff --git a/src/tiff/CMakeLists.txt b/src/tiff/CMakeLists.txt index d7404ee..1e736da 100644 --- a/src/tiff/CMakeLists.txt +++ b/src/tiff/CMakeLists.txt @@ -20,6 +20,8 @@ check_include_file (unistd.h HAVE_UNISTD_H) check_include_file (string.h HAVE_STRING_H) check_include_file (windows.h HAVE_WINDOWS_H) +set (HAVE_APPLE_OPENGL_FRAMEWORK ${APPLE}) + # Check for standard library functions check_function_exists (floor HAVE_FLOOR) check_function_exists (isascii HAVE_ISASCII) |