diff --git a/src/cmake/modules/FindIlmBase.cmake b/src/cmake/modules/FindIlmBase.cmake
index 226b3fdad4..6e140c5968 100644
--- a/src/cmake/modules/FindIlmBase.cmake
+++ b/src/cmake/modules/FindIlmBase.cmake
@@ -20,195 +20,213 @@
 # ILMBASE_LIBRARIES   - list of libraries to link against when using IlmBase.
 # ILMBASE_FOUND       - True if IlmBase was found.
 
+unset(ILMBASE_FOUND)
+
+if (NOT ILMBASE_CUSTOM)
+  # Try pkg-config first
+
+  find_package(PkgConfig)
+
+  pkg_check_modules(ILMBASE IlmBase)
+
+  if(ILMBASE_FOUND)
+    set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIRS})
+  endif(ILMBASE_FOUND)
+
+endif (NOT ILMBASE_CUSTOM)
+
 # Other standarnd issue macros
 include (FindPackageHandleStandardArgs)
 include (FindPackageMessage)
-include (SelectLibraryConfigurations)
-
-
-# Macro to assemble a helper state variable
-macro (SET_STATE_VAR varname)
-  set (tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
-  separate_arguments (tmp_ilmbaselibs)
-  set (tmp_lst
-    ${ILMBASE_CUSTOM} | ${tmp_ilmbaselibs} |
-    ${ILMBASE_HOME} | ${ILMBASE_VERSION} | ${ILMBASE_LIB_AREA}
-  )
-  set (${varname} "${tmp_lst}")
-  unset (tmp_ilmbaselibs)
-  unset (tmp_lst)
-endmacro ()
-
-# To enforce that find_* functions do not use inadvertently existing versions
-if (ILMBASE_CUSTOM)
-  set (ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif ()
 
-# Macro to search for an include directory
-macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
-  string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
-  find_path(${tmp_varname} ${includefile}
-    HINTS ${${libpath_var}}
-    PATH_SUFFIXES include
-    ${ILMBASE_FIND_OPTIONS}
-  )
-  if (${tmp_varname})
-    mark_as_advanced (${tmp_varname})
+if(NOT ILMBASE_FOUND)
+  include (SelectLibraryConfigurations)
+
+
+  # Macro to assemble a helper state variable
+  macro (SET_STATE_VAR varname)
+    set (tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
+    separate_arguments (tmp_ilmbaselibs)
+    set (tmp_lst
+      ${ILMBASE_CUSTOM} | ${tmp_ilmbaselibs} |
+      ${ILMBASE_HOME} | ${ILMBASE_VERSION} | ${ILMBASE_LIB_AREA}
+    )
+    set (${varname} "${tmp_lst}")
+    unset (tmp_ilmbaselibs)
+    unset (tmp_lst)
+  endmacro ()
+
+  # To enforce that find_* functions do not use inadvertently existing versions
+  if (ILMBASE_CUSTOM)
+    set (ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
   endif ()
-  unset (tmp_varname)
-endmacro ()
-
-
-# Macro to search for the given library and adds the cached
-# variable names to the specified list
-macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
-  string (TOUPPER ${prefix}_${libname} tmp_prefix)
-  find_library(${tmp_prefix}_LIBRARY_RELEASE
-    NAMES ${libname}
-    HINTS ${${libpath_var}}
-    PATH_SUFFIXES lib
-    ${ILMBASE_FIND_OPTIONS}
-  )
-  find_library(${tmp_prefix}_LIBRARY_DEBUG
-    NAMES ${libname}d ${libname}_d ${libname}debug ${libname}_debug
-    HINTS ${${libpath_var}}
-    PATH_SUFFIXES lib
-    ${ILMBASE_FIND_OPTIONS}
-  )
-  # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
-  select_library_configurations (${tmp_prefix})
-  list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
-
-  # Add to the list of variables which should be reset
-  list (APPEND ${cachelist_var}
-    ${tmp_prefix}_LIBRARY
-    ${tmp_prefix}_LIBRARY_RELEASE
-    ${tmp_prefix}_LIBRARY_DEBUG)
-  mark_as_advanced (
-    ${tmp_prefix}_LIBRARY
-    ${tmp_prefix}_LIBRARY_RELEASE
-    ${tmp_prefix}_LIBRARY_DEBUG)
-  unset (tmp_prefix)
-endmacro ()
-
-
-# Encode the current state of the external variables into a string
-SET_STATE_VAR (ILMBASE_CURRENT_STATE)
-
-# If the state has changed, clear the cached variables
-if (ILMBASE_CACHED_STATE AND
-    NOT ILMBASE_CACHED_STATE STREQUAL ILMBASE_CURRENT_STATE)
-
-  foreach (libvar ${ILMBASE_CACHED_VARS})
-    unset (${libvar} CACHE)
-  endforeach ()
-endif ()
 
+  # Macro to search for an include directory
+  macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+    string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+    find_path(${tmp_varname} ${includefile}
+      HINTS ${${libpath_var}}
+      PATH_SUFFIXES include
+      ${ILMBASE_FIND_OPTIONS}
+    )
+    if (${tmp_varname})
+      mark_as_advanced (${tmp_varname})
+    endif ()
+    unset (tmp_varname)
+  endmacro ()
+
+
+  # Macro to search for the given library and adds the cached
+  # variable names to the specified list
+  macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+    string (TOUPPER ${prefix}_${libname} tmp_prefix)
+    find_library(${tmp_prefix}_LIBRARY_RELEASE
+      NAMES ${libname}
+      HINTS ${${libpath_var}}
+      PATH_SUFFIXES lib
+      ${ILMBASE_FIND_OPTIONS}
+    )
+    find_library(${tmp_prefix}_LIBRARY_DEBUG
+      NAMES ${libname}d ${libname}_d ${libname}debug ${libname}_debug
+      HINTS ${${libpath_var}}
+      PATH_SUFFIXES lib
+      ${ILMBASE_FIND_OPTIONS}
+    )
+    # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
+    select_library_configurations (${tmp_prefix})
+    list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+
+    # Add to the list of variables which should be reset
+    list (APPEND ${cachelist_var}
+      ${tmp_prefix}_LIBRARY
+      ${tmp_prefix}_LIBRARY_RELEASE
+      ${tmp_prefix}_LIBRARY_DEBUG)
+    mark_as_advanced (
+      ${tmp_prefix}_LIBRARY
+      ${tmp_prefix}_LIBRARY_RELEASE
+      ${tmp_prefix}_LIBRARY_DEBUG)
+    unset (tmp_prefix)
+  endmacro ()
+
+
+  # Encode the current state of the external variables into a string
+  SET_STATE_VAR (ILMBASE_CURRENT_STATE)
+
+  # If the state has changed, clear the cached variables
+  if (ILMBASE_CACHED_STATE AND
+      NOT ILMBASE_CACHED_STATE STREQUAL ILMBASE_CURRENT_STATE)
 
-# Generic search paths
-set (IlmBase_generic_include_paths
-  ${ILMBASE_CUSTOM_INCLUDE_DIR}
-  /usr/include
-  /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
-  /usr/local/include
-  /sw/include
-  /opt/local/include)
-set (IlmBase_generic_library_paths
-  ${ILMBASE_CUSTOM_LIB_DIR}
-  /usr/lib
-  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  /usr/local/lib
-  /sw/lib
-  /opt/local/lib)
-
-# Search paths for the IlmBase files
-if (ILMBASE_HOME)
-  if (ILMBASE_VERSION)
-    set (IlmBase_include_paths
-      ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/include
-      ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION})
+    foreach (libvar ${ILMBASE_CACHED_VARS})
+      unset (${libvar} CACHE)
+    endforeach ()
+  endif ()
+
+
+  # Generic search paths
+  set (IlmBase_generic_include_paths
+    ${ILMBASE_CUSTOM_INCLUDE_DIR}
+    /usr/include
+    /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
+    /usr/local/include
+    /sw/include
+    /opt/local/include)
+  set (IlmBase_generic_library_paths
+    ${ILMBASE_CUSTOM_LIB_DIR}
+    /usr/lib
+    /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+    /usr/local/lib
+    /sw/lib
+    /opt/local/lib)
+
+  # Search paths for the IlmBase files
+  if (ILMBASE_HOME)
+    if (ILMBASE_VERSION)
+      set (IlmBase_include_paths
+        ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/include
+        ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION})
+      set (IlmBase_library_paths
+        ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/lib
+        ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION})
+    endif()
+    list (APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
     set (IlmBase_library_paths
-      ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/lib
-      ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION})
-  endif()
-  list (APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
-  set (IlmBase_library_paths
-    ${ILMBASE_HOME}/lib
-    ${ILMBASE_HOME}/lib64
-    ${ILMBASE_LIB_AREA}
-    ${IlmBase_library_paths})
-endif ()
-list (APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
-list (APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
-
-# Locate the header files
-PREFIX_FIND_INCLUDE_DIR (IlmBase
-  OpenEXR/IlmBaseConfig.h IlmBase_include_paths)
-
-if (ILMBASE_INCLUDE_DIR)
-  # Get the version from config file, if not already set.
-  if (NOT ILMBASE_VERSION)
-    FILE(STRINGS "${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h" ILMBASE_BUILD_SPECIFICATION
-         REGEX "^[ \t]*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
-
-    if(ILMBASE_BUILD_SPECIFICATION)
-      message(STATUS "${ILMBASE_BUILD_SPECIFICATION}")
-      string(REGEX REPLACE ".*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
-             "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
-      set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
-    else()
-      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
-      message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
-      set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
+      ${ILMBASE_HOME}/lib
+      ${ILMBASE_HOME}/lib64
+      ${ILMBASE_LIB_AREA}
+      ${IlmBase_library_paths})
+  endif ()
+  list (APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
+  list (APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
+
+  # Locate the header files
+  PREFIX_FIND_INCLUDE_DIR (IlmBase
+    OpenEXR/IlmBaseConfig.h IlmBase_include_paths)
+
+  if (ILMBASE_INCLUDE_DIR)
+    # Get the version from config file, if not already set.
+    if (NOT ILMBASE_VERSION)
+      FILE(STRINGS "${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h" ILMBASE_BUILD_SPECIFICATION
+           REGEX "^[ \t]*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
+
+      if(ILMBASE_BUILD_SPECIFICATION)
+        message(STATUS "${ILMBASE_BUILD_SPECIFICATION}")
+        string(REGEX REPLACE ".*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
+               "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
+        set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
+      else()
+        # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
+        message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
+        set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
+      endif()
     endif()
-  endif()
-endif ()
+  endif ()
 
 
-if (ILMBASE_CUSTOM)
-  if (NOT ILMBASE_CUSTOM_LIBRARIES)
-    message (FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
-  endif()
-  set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
-  separate_arguments(IlmBase_Libraries)
-#else ()
-elseif (${ILMBASE_VERSION} VERSION_LESS "2.1")
-  set (IlmBase_Libraries Half Iex Imath IlmThread)
-else ()
-  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-  set (IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
-endif ()
+  if (ILMBASE_CUSTOM)
+    if (NOT ILMBASE_CUSTOM_LIBRARIES)
+      message (FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
+    endif()
+    set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
+    separate_arguments(IlmBase_Libraries)
+  #else ()
+  elseif (${ILMBASE_VERSION} VERSION_LESS "2.1")
+    set (IlmBase_Libraries Half Iex Imath IlmThread)
+  else ()
+    string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
+    set (IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
+  endif ()
 
 
-# Locate the IlmBase libraries
-set (IlmBase_libvars "")
-set (IlmBase_cachevars "")
-foreach (ilmbase_lib ${IlmBase_Libraries})
-  PREFIX_FIND_LIB (IlmBase ${ilmbase_lib}
-    IlmBase_library_paths IlmBase_libvars IlmBase_cachevars)
-endforeach ()
-# Create the list of variables that might need to be cleared
-set (ILMBASE_CACHED_VARS
-  ILMBASE_INCLUDE_DIR ${IlmBase_cachevars}
-  CACHE INTERNAL "Variables set by FindIlmBase.cmake" FORCE)
-
-# Store the current state so that variables might be cleared if required
-set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
-  CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
-
-# Link with pthreads if required
-if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
-  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
-    ILMBASE_HAVE_PTHREAD
-    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
-  )
-  if (ILMBASE_HAVE_PTHREAD)
-    find_package (Threads)
-    if (CMAKE_USE_PTHREADS_INIT)
-      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+  # Locate the IlmBase libraries
+  set (IlmBase_libvars "")
+  set (IlmBase_cachevars "")
+  foreach (ilmbase_lib ${IlmBase_Libraries})
+    PREFIX_FIND_LIB (IlmBase ${ilmbase_lib}
+      IlmBase_library_paths IlmBase_libvars IlmBase_cachevars)
+  endforeach ()
+  # Create the list of variables that might need to be cleared
+  set (ILMBASE_CACHED_VARS
+    ILMBASE_INCLUDE_DIR ${IlmBase_cachevars}
+    CACHE INTERNAL "Variables set by FindIlmBase.cmake" FORCE)
+
+  # Store the current state so that variables might be cleared if required
+  set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
+    CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
+
+  # Link with pthreads if required
+  if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
+    file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
+      ILMBASE_HAVE_PTHREAD
+      REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
+    )
+    if (ILMBASE_HAVE_PTHREAD)
+      find_package (Threads)
+      if (CMAKE_USE_PTHREADS_INIT)
+        set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+      endif ()
     endif ()
   endif ()
-endif ()
+endif()
 
 # Use the standard function to handle ILMBASE_FOUND
 FIND_PACKAGE_HANDLE_STANDARD_ARGS (IlmBase DEFAULT_MSG