Update CMake find modules

Author: rickertm

cmake/CPackConfig.cmake

@@ -169,58 +169,46 @@ if(Boost_INCLUDE_DIRS)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libboost-dev (>= 1.46)")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "boost-devel >= 1.46")
 endif()
-if(BULLET_INCLUDE_DIRS AND BULLET_BULLETCOLLISION_LIBRARY_RELEASE AND BULLET_BULLETDYNAMICS_LIBRARY_RELEASE AND BULLET_BULLETSOFTBODY_LIBRARY_RELEASE AND BULLET_LINEARMATH_LIBRARY_RELEASE)
+if(BULLET_INCLUDE_DIR AND BULLET_BULLETCOLLISION_LIBRARY_RELEASE AND BULLET_BULLETDYNAMICS_LIBRARY_RELEASE AND BULLET_BULLETSOFTBODY_LIBRARY_RELEASE AND BULLET_LINEARMATH_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libbullet-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "bullet-devel")
 endif()
-if(CCD_INCLUDE_DIRS AND CCD_LIBRARY_RELEASE)
-	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libccd-dev")
-	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "libccd-devel")
-endif()
-if(Coin_INCLUDE_DIRS AND Coin_LIBRARY_RELEASE)
+if(Coin_INCLUDE_DIR AND Coin_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libcoin-dev | libcoin80-dev | libcoin60-dev")
-	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "Coin3-devel")
+	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "Coin4-devel or Coin3-devel or Coin2-devel")
 endif()
-if(Comedi_INCLUDE_DIRS AND Comedi_LIBRARY_RELEASE)
+if(COMEDI_INCLUDE_DIR AND COMEDI_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libcomedi-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "comedilib-devel")
 endif()
-if(EIGEN3_INCLUDE_DIRS)
+if(EIGEN3_INCLUDE_DIR)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libeigen3-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "eigen3-devel")
 endif()
-if(FCL_INCLUDE_DIRS AND FCL_LIBRARY_RELEASE)
+if(FCL_INCLUDE_DIR AND FCL_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libfcl-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "fcl-devel")
 endif()
-if(libdc1394_INCLUDE_DIRS AND libdc1394_LIBRARY_RELEASE)
+if(LIBDC1394_INCLUDE_DIR AND LIBDC1394_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libdc1394-dev | libdc1394-22-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "libdc1394-devel")
 endif()
-if(LIBLZMA_INCLUDE_DIRS AND LIBLZMA_LIBRARY_RELEASE)
-	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "liblzma-dev")
-	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "lzma-devel")
-endif()
-if(LIBXML2_INCLUDE_DIRS AND LIBXML2_LIBRARY_RELEASE)
+if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libxml2-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "libxml2-devel")
 endif()
-if(LIBXSLT_INCLUDE_DIRS AND LIBXSLT_LIBRARY_RELEASE)
+if(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libxslt1-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "libxslt-devel")
 endif()
-if(NLOPT_INCLUDE_DIRS AND NLOPT_LIBRARY_RELEASE)
+if(NLOPT_INCLUDE_DIR AND NLOPT_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libnlopt-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "NLopt-devel")
 endif()
-if(ODE_INCLUDE_DIRS AND ODE_LIBRARY_RELEASE)
+if(ODE_INCLUDE_DIR AND ODE_LIBRARY_RELEASE)
 	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "libode-dev")
 	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "ode-devel")
 endif()
-if(ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARY_RELEASE)
-	list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "zlib1g-dev")
-	list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "zlib-devel")
-endif()
 
 foreach(COMPONENT IN LISTS COMPONENTS)
 	string(TOUPPER ${COMPONENT} COMPONENT_UPPER)

cmake/FindATIDAQ.cmake

@@ -2,48 +2,39 @@ include(FindPackageHandleStandardArgs)
 include(SelectLibraryConfigurations)
 
 find_path(
-	ATIDAQ_INCLUDE_DIRS
-	NAMES
-	atidaq/ftconfig.h
+	ATIDAQ_INCLUDE_DIR
+	NAMES atidaq/ftconfig.h
 )
-
-mark_as_advanced(ATIDAQ_INCLUDE_DIRS)
-
 find_library(
 	ATIDAQ_LIBRARY_DEBUG
-	NAMES
-	atidaqd
+	NAMES atidaqd
 )
-
 find_library(
 	ATIDAQ_LIBRARY_RELEASE
-	NAMES
-	atidaq
+	NAMES atidaq
 )
-
 select_library_configurations(ATIDAQ)
 
+set(ATIDAQ_INCLUDE_DIRS ${ATIDAQ_INCLUDE_DIR})
+set(ATIDAQ_LIBRARIES ${ATIDAQ_LIBRARY})
+
 find_package_handle_standard_args(
 	ATIDAQ
 	FOUND_VAR ATIDAQ_FOUND
-	REQUIRED_VARS ATIDAQ_INCLUDE_DIRS ATIDAQ_LIBRARIES
+	REQUIRED_VARS ATIDAQ_INCLUDE_DIR ATIDAQ_LIBRARY
 )
 
 if(ATIDAQ_FOUND AND NOT TARGET ATIDAQ::ATIDAQ)
 	add_library(ATIDAQ::ATIDAQ UNKNOWN IMPORTED)
-	
 	if(ATIDAQ_LIBRARY_RELEASE)
 		set_property(TARGET ATIDAQ::ATIDAQ APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 		set_target_properties(ATIDAQ::ATIDAQ PROPERTIES IMPORTED_LOCATION_RELEASE "${ATIDAQ_LIBRARY_RELEASE}")
 	endif()
-	
 	if(ATIDAQ_LIBRARY_DEBUG)
 		set_property(TARGET ATIDAQ::ATIDAQ APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 		set_target_properties(ATIDAQ::ATIDAQ PROPERTIES IMPORTED_LOCATION_DEBUG "${ATIDAQ_LIBRARY_DEBUG}")
 	endif()
-	
-	set_target_properties(
-		ATIDAQ::ATIDAQ PROPERTIES
-		INTERFACE_INCLUDE_DIRECTORIES "${ATIDAQ_INCLUDE_DIRS}"
-	)
+	set_target_properties(ATIDAQ::ATIDAQ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ATIDAQ_INCLUDE_DIRS}")
 endif()
+
+mark_as_advanced(ATIDAQ_INCLUDE_DIR)

cmake/FindBoost.cmake

@@ -0,0 +1,16 @@
+set(_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Boost)
+
+if(Boost_FOUND AND NOT TARGET Boost::headers)
+	add_library(Boost::headers INTERFACE IMPORTED)
+	set_target_properties(Boost::headers PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
+endif()
+if(TARGET Boost::headers AND NOT TARGET Boost::boost)
+	add_library(Boost::boost INTERFACE IMPORTED)
+	set_target_properties(Boost::boost PROPERTIES INTERFACE_LINK_LIBRARIES "Boost::headers")
+endif()
+
+set(CMAKE_MODULE_PATH ${_CMAKE_MODULE_PATH})
+unset(_CMAKE_MODULE_PATH)