cmake: fix Mac OS X IPP detection

This commit is contained in:
Marc-André Moreau
2013-01-19 20:46:14 -05:00
parent 151c2a63e4
commit 9373e2549e

View File

@@ -203,16 +203,20 @@ function(set_ipp_variables _LATEST_VERSION)
# set INCLUDE and LIB folders
set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include PARENT_SCOPE)
if (IPP_X64)
if(NOT EXISTS ${IPP_ROOT_DIR}/lib/intel64)
message(SEND_ERROR "IPP EM64T libraries not found")
endif()
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64 PARENT_SCOPE)
if(APPLE)
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib PARENT_SCOPE)
else()
if(NOT EXISTS ${IPP_ROOT_DIR}/lib/ia32)
message(SEND_ERROR "IPP IA32 libraries not found")
if(IPP_X64)
if(NOT EXISTS ${IPP_ROOT_DIR}/lib/intel64)
message(SEND_ERROR "IPP EM64T libraries not found")
endif()
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64 PARENT_SCOPE)
else()
if(NOT EXISTS ${IPP_ROOT_DIR}/lib/ia32)
message(SEND_ERROR "IPP IA32 libraries not found")
endif()
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
endif()
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
endif()
# set IPP_LIBRARIES variable (7.x lib names)
@@ -350,26 +354,31 @@ foreach(curdir ${CMAKE_SYSTEM_PREFIX_PATH} /opt)
set(curdir ${curdir}/intel)
if(EXISTS ${curdir})
file(GLOB_RECURSE liblist FOLLOW_SYMLINKS ${curdir}/libiomp5.*)
foreach(lib ${liblist})
get_filename_component(libdir ${lib} REALPATH)
get_filename_component(libdir ${libdir} PATH)
file(GLOB_RECURSE liblist FOLLOW_SYMLINKS ${curdir}/libiomp5.*)
foreach(lib ${liblist})
get_filename_component(libdir ${lib} REALPATH)
get_filename_component(libdir ${libdir} PATH)
if(${IPP_VERSION_MAJOR} VERSION_LESS "7")
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
else()
if(IPP_X64)
if(("${libdir}" MATCHES "intel64"))
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
endif()
else()
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
endif()
endif()
endforeach(lib)
if(${IPP_VERSION_MAJOR} VERSION_LESS "7")
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
else()
if(APPLE)
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
else()
if(IPP_X64)
if(("${libdir}" MATCHES "intel64"))
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
endif()
else()
set(IPP_COMPILER_LIBRARY_DIRS ${libdir})
set(IPP_COMPILER_LIBRARIES iomp5)
endif()
endif()
endif()
endforeach(lib)
endif()
endforeach(curdir)