made data dir options more visible in cmake config

better error reporting in file::load

CMakeLists.txt

@@ -37,6 +37,7 @@ include(CMakePackageConfigHelpers)
 include(CheckCXXSourceCompiles)
 include(CheckCXXSourceCompiles)
 include(GenerateExportHeader)
 include(GenerateExportHeader)
 include(CTest)
 include(CTest)
+include(CMakeDependentOption)
 
 
 set(CXX_EXTENSIONS OFF)
 set(CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD 20)
@@ -50,9 +51,6 @@ elseif(MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
 endif()
 endif()
 
 
-# Building shared libraries?
-option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" OFF)
-
 # Build documentation?
 # Build documentation?
 option(BUILD_DOCUMENTATION "Build the documentation" OFF)
 option(BUILD_DOCUMENTATION "Build the documentation" OFF)
 
 
@@ -62,6 +60,10 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 # Optionally build a version to be installed inside CCP4
 # Optionally build a version to be installed inside CCP4
 option(BUILD_FOR_CCP4 "Build a version to be installed in CCP4" OFF)
 option(BUILD_FOR_CCP4 "Build a version to be installed in CCP4" OFF)
 
 
+# Building shared libraries?
+cmake_policy(SET CMP0127 NEW)
+cmake_dependent_option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" OFF "NOT (BUILD_FOR_CCP4 AND WIN32)" ON)
+
 # Lots of code depend on the availability of the components.cif file
 # Lots of code depend on the availability of the components.cif file
 option(CIFPP_DOWNLOAD_CCD "Download the CCD file components.cif during installation" ON)
 option(CIFPP_DOWNLOAD_CCD "Download the CCD file components.cif during installation" ON)
 
 
@@ -317,11 +319,12 @@ if(CIFPP_DOWNLOAD_CCD)
 endif()
 endif()
 
 
 # Installation directories
 # Installation directories
-set(CIFPP_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp")
+set(CIFPP_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp" CACHE PATH "The directory where dictionary files are stored")
 target_compile_definitions(cifpp PUBLIC DATA_DIR="${CIFPP_DATA_DIR}")
 target_compile_definitions(cifpp PUBLIC DATA_DIR="${CIFPP_DATA_DIR}")
 
 
 if(UNIX)
 if(UNIX)
-	set(CIFPP_CACHE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/cache/libcifpp")
+	set(CIFPP_CACHE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/cache/libcifpp"
+		CACHE PATH "The directory where the update script stores new dictionary files")
 	target_compile_definitions(cifpp PUBLIC CACHE_DIR="${CIFPP_CACHE_DIR}")
 	target_compile_definitions(cifpp PUBLIC CACHE_DIR="${CIFPP_CACHE_DIR}")
 
 
 	set(CIFPP_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
 	set(CIFPP_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")

src/file.cpp

@@ -182,17 +182,17 @@ std::tuple<file::iterator, bool> file::emplace(std::string_view name)
 
 
 void file::load(const std::filesystem::path &p)
 void file::load(const std::filesystem::path &p)
 {
 {
+	gzio::ifstream in(p);
+	if (not in.is_open())
+		throw std::runtime_error("Could not open file '" + p.string() + '\'');
+
 	try
 	try
 	{
 	{
-		gzio::ifstream in(p);
-		if (not in.is_open())
-			throw std::runtime_error("Could not open file " + p.string());
-
 		load(in);
 		load(in);
 	}
 	}
 	catch (const std::exception &)
 	catch (const std::exception &)
 	{
 	{
-		throw_with_nested(std::runtime_error("Error reading file " + p.string()));
+		throw_with_nested(std::runtime_error("Error reading file '" + p.string() + '\''));
 	}
 	}
 }
 }