diff --git a/CMakeLists.txt b/CMakeLists.txt index d6b6b5ce46e7116c22298ab6437d02c865600683..628dfb0ceb730730e88aa3217a2cf380614b49ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,13 @@ add_definitions(-DBOOST_TEST_DYN_LINK) include_directories(BEFORE "include") if(PKG_CONFIG_FOUND) - pkg_check_modules(CCD REQUIRED ccd) + pkg_check_modules(CCD ccd) + # check to see if the pkg is installed under the libccd name + if(NOT CCD_FOUND) + pkg_check_modules(CCD libccd) + endif() endif() + if(NOT CCD_FOUND) # if pkfconfig is not installed, then fall back on more fragile detection # of ccd diff --git a/CMakeModules/FCLVersion.cmake b/CMakeModules/FCLVersion.cmake index 0199e288120db223c7388780331485c24dcf7db1..cf8e02354450d6f369bfa1176e20be797c16dc4c 100644 --- a/CMakeModules/FCLVersion.cmake +++ b/CMakeModules/FCLVersion.cmake @@ -1,7 +1,7 @@ # set the version in a way CMake can use set(FCL_MAJOR_VERSION 0) set(FCL_MINOR_VERSION 2) -set(FCL_PATCH_VERSION 6) +set(FCL_PATCH_VERSION 7) set(FCL_VERSION "${FCL_MAJOR_VERSION}.${FCL_MINOR_VERSION}.${FCL_PATCH_VERSION}") # increment this when we have ABI changes