CDRIVER-1349 let CMake calculate package config directories

Author: rcsanchez97

build/cmake/MongoCPackage.cmake

@@ -1,5 +1,5 @@
-set (PACKAGE_INCLUDE_INSTALL_DIRS ${MONGOC_HEADER_INSTALL_DIR})
-set (PACKAGE_LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
+set (INCLUDE_INSTALL_DIRS ${MONGOC_HEADER_INSTALL_DIR})
+set (LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
 set (PACKAGE_LIBRARIES mongoc-1.0)
 
 include (CMakePackageConfigHelpers)
@@ -11,7 +11,7 @@ function (install_package_config_file prefix)
          build/cmake/libmongoc-${prefix}-${suffix}.in
          ${CMAKE_CURRENT_BINARY_DIR}/libmongoc-${prefix}-${suffix}
          INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libmongoc-${prefix}
-         PATH_VARS PACKAGE_INCLUDE_INSTALL_DIRS PACKAGE_LIBRARY_INSTALL_DIRS
+         PATH_VARS INCLUDE_INSTALL_DIRS LIBRARY_INSTALL_DIRS
       )
 
       install (

build/cmake/libmongoc-1.0-config.cmake.in

@@ -19,26 +19,16 @@ set (MONGOC_VERSION @MONGOC_VERSION@)
 
 find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
 
-# In a pure-CMake project this is inserted by configure_package_config_file (),
-# but we want to be able to build this file the same from the Autotools, so
-# let's manually insert this code.
-get_filename_component (PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+@PACKAGE_INIT@
 
-macro (set_and_check _var _file)
-  set (${_var} "${_file}")
-  if (NOT EXISTS "${_file}")
-    message (FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif ()
-endmacro ()
-
-set_and_check (MONGOC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+set_and_check (MONGOC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@")
 list (APPEND MONGOC_INCLUDE_DIRS ${BSON_INCLUDE_DIRS})
 
 # We want to provide an absolute path to the library and we know the
 # directory and the base name, but not the suffix, so we use CMake's
 # find_library () to pick that up.  Users can override this by configuring
 # MONGOC_LIBRARY themselves.
-find_library (MONGOC_LIBRARY mongoc-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+find_library (MONGOC_LIBRARY mongoc-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH)
 set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
 
 # If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be

build/cmake/libmongoc-static-1.0-config.cmake.in

@@ -19,26 +19,16 @@ set (MONGOC_STATIC_VERSION @MONGOC_VERSION@)
 
 find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
 
-# In a pure-CMake project this is inserted by configure_package_config_file (),
-# but we want to be able to build this file the same from the Autotools, so
-# let's manually insert this code.
-get_filename_component (PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+@PACKAGE_INIT@
 
-macro (set_and_check _var _file)
-  set (${_var} "${_file}")
-  if (NOT EXISTS "${_file}")
-    message (FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif ()
-endmacro ()
-
-set_and_check (MONGOC_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+set_and_check (MONGOC_STATIC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@")
 list (APPEND MONGOC_STATIC_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS})
 
 # We want to provide an absolute path to the library and we know the
 # directory and the base name, but not the suffix, so we use CMake's
 # find_library () to pick that up.  Users can override this by configuring
 # MONGOC_STATIC_LIBRARY themselves.
-find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH)
 if (MSVC)
    set (MONGOC_STATIC_LIB_EXT "lib")
 else ()

src/libbson/build/cmake/BSONPackage.cmake

@@ -1,5 +1,5 @@
-set (PACKAGE_INCLUDE_INSTALL_DIRS ${BSON_HEADER_INSTALL_DIR})
-set (PACKAGE_LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
+set (INCLUDE_INSTALL_DIRS ${BSON_HEADER_INSTALL_DIR})
+set (LIBRARY_INSTALL_DIRS ${CMAKE_INSTALL_LIBDIR})
 set (PACKAGE_LIBRARIES bson-1.0)
 
 include (CMakePackageConfigHelpers)
@@ -11,7 +11,7 @@ function (install_package_config_file prefix)
          build/cmake/libbson-${prefix}-${suffix}.in
          ${CMAKE_CURRENT_BINARY_DIR}/libbson-${prefix}-${suffix}
          INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libbson-${prefix}
-         PATH_VARS PACKAGE_INCLUDE_INSTALL_DIRS PACKAGE_LIBRARY_INSTALL_DIRS
+         PATH_VARS INCLUDE_INSTALL_DIRS LIBRARY_INSTALL_DIRS
       )
 
       install (

src/libbson/build/cmake/libbson-1.0-config.cmake.in

@@ -17,25 +17,15 @@ set (BSON_MINOR_VERSION @BSON_MINOR_VERSION@)
 set (BSON_MICRO_VERSION @BSON_MICRO_VERSION@)
 set (BSON_VERSION @BSON_VERSION@)
 
-# In a pure-CMake project this is inserted by configure_package_config_file (),
-# but we want to be able to build this file the same from the Autotools, so
-# let's manually insert this code.
-get_filename_component (PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+@PACKAGE_INIT@
 
-macro (set_and_check _var _file)
-  set (${_var} "${_file}")
-  if (NOT EXISTS "${_file}")
-    message (FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif ()
-endmacro ()
-
-set_and_check (BSON_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+set_and_check (BSON_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@")
 
 # We want to provide an absolute path to the library and we know the
 # directory and the base name, but not the suffix, so we use CMake's
 # find_library () to pick that up.  Users can override this by configuring
 # BSON_LIBRARY themselves.
-find_library (BSON_LIBRARY bson-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+find_library (BSON_LIBRARY bson-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH)
 
 set (BSON_LIBRARIES ${BSON_LIBRARY})
 

src/libbson/build/cmake/libbson-static-1.0-config.cmake.in

@@ -17,25 +17,15 @@ set (BSON_STATIC_MINOR_VERSION @BSON_MINOR_VERSION@)
 set (BSON_STATIC_MICRO_VERSION @BSON_MICRO_VERSION@)
 set (BSON_STATIC_VERSION @BSON_VERSION@)
 
-# In a pure-CMake project this is inserted by configure_package_config_file (),
-# but we want to be able to build this file the same from the Autotools, so
-# let's manually insert this code.
-get_filename_component (PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+@PACKAGE_INIT@
 
-macro (set_and_check _var _file)
-  set (${_var} "${_file}")
-  if (NOT EXISTS "${_file}")
-    message (FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif ()
-endmacro ()
-
-set_and_check (BSON_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+set_and_check (BSON_STATIC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@")
 
 # We want to provide an absolute path to the library and we know the
 # directory and the base name, but not the suffix, so we use CMake's
 # find_library () to pick that up.  Users can override this by configuring
 # BSON_STATIC_LIBRARY themselves.
-find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH)
 
 set (BSON_STATIC_LIBRARIES ${BSON_STATIC_LIBRARY})