separate FindIPP.cmake

Author: casperdcl

src/Core/CMakeLists.txt

@@ -52,40 +52,21 @@ else()
   set (OpenMP_EXE_LINKER_FLAGS ${OpenMP_C_FLAGS})
 endif()
 
-if (UNIX)
-  find_library(IPP_CORE libippcore.so)
-  find_library(IPP_S libipps.so)
-  find_library(IPP_VM libippvm.so)
-  find_library(IPP_I libippi.so)
-elseif(WIN32)
-  find_library(IPP_CORE ippcore)
-  find_library(IPP_S ipps)
-  find_library(IPP_VM ippvm)
-  find_library(IPP_I ippi)
-endif()
-
-if(IPP_CORE AND IPP_S AND IPP_VM AND IPP_I)
-  set(USE_IPP TRUE)
-  message("IPP libraries found")
-  file(REAL_PATH ${IPP_CORE}/../.. LIB_BASE)
-  find_file(IPP_INCLUDE ipp.h ${LIB_BASE} PATH_SUFFIXES include include/ipp)
-  cmake_path(GET IPP_INCLUDE PARENT_PATH IPP_INCLUDE)
-else()
-  set(USE_IPP FALSE)
-  message("IPP libraries not found, FBP_filtering not in build")
-endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+find_package(IPP)
 
-if(USE_IPP)
+if(IPP_FOUND)
   add_library(cilacc SHARED ${CMAKE_CURRENT_SOURCE_DIR}/utilities.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/axpby.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/FiniteDifferenceLibrary.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/FBP_filtering.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/Binning.cpp)
 
 
-  target_link_libraries(cilacc ${OpenMP_EXE_LINKER_FLAGS} ${IPP_CORE} ${IPP_S} ${IPP_I} ${IPP_VM})
-  include_directories(cilacc PUBLIC ${IPP_INCLUDE} ${CMAKE_CURRENT_SOURCE_DIR}/include)
+  target_link_libraries(cilacc ${OpenMP_EXE_LINKER_FLAGS} ${IPP_LIBRARIES})
+  include_directories(cilacc PUBLIC ${IPP_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 else()
+  message(WARNING "IPP libraries not found, FBP_filtering not in build")
   add_library(cilacc SHARED ${CMAKE_CURRENT_SOURCE_DIR}/utilities.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/axpby.cpp
                             ${CMAKE_CURRENT_SOURCE_DIR}/FiniteDifferenceLibrary.cpp )

src/Core/cmake/FindIPP.cmake

@@ -0,0 +1,27 @@
+# Inputs (optional): IPP_ROOT
+# Outputs: IPP_FOUND, IPP_INCLUDE_DIRS, IPP_LIBRARIES
+
+find_path(IPP_ROOT_DIR include/ipp.h PATHS ${IPP_ROOT} $ENV{IPPROOT} $ENV{CONDA_PREFIX})
+find_path(IPP_INCLUDE_DIR ipp.h PATHS ${IPP_ROOT_DIR}/include)
+
+if(APPLE)
+  set(IPP_PRE "lib")
+  set(IPP_POST ".a")
+elseif(NOT WIN32)
+  set(IPP_PRE "lib")
+  set(IPP_POST ".so")
+endif()
+find_library(IPP_CORE ${IPP_PRE}ippcore${IPP_POST} PATHS ${IPP_ROOT_DIR})
+find_library(IPP_S ${IPP_PRE}ipps${IPP_POST} PATHS ${IPP_ROOT_DIR})
+find_library(IPP_VM ${IPP_PRE}ippvm${IPP_POST} PATHS ${IPP_ROOT_DIR})
+find_library(IPP_I ${IPP_PRE}ippi${IPP_POST} PATHS ${IPP_ROOT_DIR})
+
+if(IPP_INCLUDE_DIR AND IPP_CORE AND IPP_S AND IPP_VM AND IPP_I)
+  message(STATUS "IPP found in: ${IPP_ROOT_DIR}")
+  set(IPP_FOUND TRUE)
+  set(IPP_INCLUDE_DIRS "${IPP_INCLUDE_DIR}")
+  set(IPP_LIBRARIES "${IPP_CORE};${IPP_S};${IPP_VM};${IPP_I}")
+else()
+  message(STATUS "IPP not found")
+  set(IPP_NOTFOUND TRUE)
+endif()