[BUILD] switched from CMAKE_FIND_ROOT_PATH to CMAKE_PREFIX_PATH as it is the preferred way for giving additional base-directories for find_package

Author: aiche

cmake/setup_lib_find_paths.cmake

@@ -38,41 +38,22 @@
 # actual libraries are found in the CMake files of the individual componenents.
 #------------------------------------------------------------------------------
 
-set(CONTRIB_CUSTOM_DIR CACHE DOC "DEPRECATED: Please use CMAKE_FIND_ROOT_PATH instead! User defined location of contrib dir. If left empty we assume the contrib to be in OpenMS/contrib!")
-set(CONTRIB_DIR ${OPENMS_HOST_DIRECTORY}/contrib/ CACHE INTERNAL "Final contrib path after looking at CMAKE_FIND_ROOT_PATH. Defaults to OpenMS/contrib")
-
-if("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
-	if(NOT "${CONTRIB_CUSTOM_DIR}" STREQUAL "")
-		message("Please do no longer use -DCONTRIB_CUSTOM_DIR. This option is deprecated. Please use -DCMAKE_FIND_ROOT_PATH instead.")
-		list(INSERT CONTRIB_DIR 0 ${CONTRIB_CUSTOM_DIR})
-  else()
-		# Append a few unusual default search directories for convenience
-		# if no FIND ROOT PATH was specified.
-		list(APPEND CONTRIB_DIR /opt/local /usr/local /usr)
-	endif()
+if(NOT "${CMAKE_FIND_ROOT_PATH}" STREQUAL "" AND "${CMAKE_PREFIX_PATH}" STREQUAL "")
+  set(CMAKE_PREFIX_PATH "${CMAKE_FIND_ROOT_PATH}")
+  message(STATUS "Please switch to CMAKE_PREFIX_PATH CMAKE_FIND_ROOT_PATH ")
 endif()
 
-#------------------------------------------------------------------------------
-# Append all contrib dirs to the (potentially empty) FIND_ROOT_PATH.
-# This will be the final search order used by regular CMAKE modules (by default)
-# and by the OpenMS macros (via CONTRIB_DIR).
-list(APPEND CMAKE_FIND_ROOT_PATH "${CONTRIB_DIR}")
-set(TMP "")
-foreach(CUSTOM_PATH ${CMAKE_FIND_ROOT_PATH})
-  get_filename_component(ABS_PATH ${CUSTOM_PATH} ABSOLUTE)
-	list(APPEND TMP ${ABS_PATH})
-endforeach()
-set(CMAKE_FIND_ROOT_PATH "${TMP}")
-set(CONTRIB_DIR "${CMAKE_FIND_ROOT_PATH}")
-
+list(APPEND CMAKE_PREFIX_PATH ${OPENMS_HOST_DIRECTORY}/contrib/)
+# TODO: remove as soon as all libraries where switched to proper find modules
 set(CONTRIB_INCLUDE_DIR "" CACHE INTERNAL "contrib include dir")
 set(CONTRIB_LIB_DIR "" CACHE INTERNAL "contrib lib dir")
-foreach(CONTRIB_PATH ${CONTRIB_DIR})
+foreach(CONTRIB_PATH ${CMAKE_PREFIX_PATH})
   list(APPEND CONTRIB_INCLUDE_DIR "${CONTRIB_PATH}/include/")
   list(APPEND CONTRIB_LIB_DIR "${CONTRIB_PATH}/lib/")
 endforeach()
+
 message(STATUS "===========================================================================")
-message(STATUS "CMake find root path: ${CMAKE_FIND_ROOT_PATH}")
+message(STATUS "CMake prefix path: ${CMAKE_PREFIX_PATH}")
 message(STATUS "Contrib search directories:  ${CONTRIB_DIR}")
 message(STATUS "Contrib library directories: ${CONTRIB_LIB_DIR}")
 message(STATUS "Contrib include directories: ${CONTRIB_INCLUDE_DIR}")