From dcf4e4f639fd17856bcd398dd2b58c2dc8851ab0 Mon Sep 17 00:00:00 2001 From: "Maarten L. Hekkelman" Date: Thu, 14 Mar 2024 07:42:09 +0100 Subject: [PATCH 1/2] minimum requires cmake version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de9dbdb..b3e0ae1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.23) # set the project name project(mkdssp VERSION 4.4.6 LANGUAGES CXX) From bf823b8bae6ddd5a888af0d1fd006d7088bc3c8c Mon Sep 17 00:00:00 2001 From: "Maarten L. Hekkelman" Date: Sat, 30 Mar 2024 21:20:10 +0100 Subject: [PATCH 2/2] use system installed libraries by default --- CMakeLists.txt | 12 +++++++++--- changelog | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3e0ae1..67153d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,12 +25,11 @@ cmake_minimum_required(VERSION 3.23) # set the project name -project(mkdssp VERSION 4.4.6 LANGUAGES CXX) +project(mkdssp VERSION 4.4.7 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(CTest) -include(FetchContent) include(VersionString) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") @@ -97,8 +96,11 @@ endif() set(CMAKE_THREAD_PREFER_PTHREAD) set(THREADS_PREFER_PTHREAD_FLAG) find_package(Threads) +find_package(libmcfp QUIET) + +if(NOT libmcfp_FOUND) + include(FetchContent) -if(NOT PDB_REDO_META) if(CMAKE_VERSION GREATER_EQUAL 3.28) set(EXLC "EXCLUDE_FROM_ALL") endif() @@ -110,7 +112,11 @@ if(NOT PDB_REDO_META) GIT_TAG v1.3.1) FetchContent_MakeAvailable(libmcfp) +endif() + +find_package(cifpp 7 QUIET) +if(NOT cifpp_FOUND) set(CIFPP_DOWNLOAD_CCD OFF) FetchContent_Declare( diff --git a/changelog b/changelog index 4e60fd3..966afc5 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +Version 4.4.7 +- Fix cmakefile to use system installed libraries by default + Version 4.4.6 - Update dependency on libcifpp to version 7