Merge branch 'newer-cmake-files' of github.com:PDB-REDO/libcifpp into newer-cmake-files

CMakeLists.txt

@@ -27,7 +27,7 @@ if(MSVC)
 endif()
 endif()
 
 
 # Build shared libraries by default (not my cup of tea, but hey)
 # Build shared libraries by default (not my cup of tea, but hey)
-option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" ON)
+option(BUILD_SHARED_LIBS "Build a shared library instead of a static one" OFF)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 
 # set(CMAKE_DEBUG_POSTFIX d)
 # set(CMAKE_DEBUG_POSTFIX d)

test/unit-test.cpp

@@ -1426,17 +1426,19 @@ _cat_3.num
 
 
 	BOOST_CHECK(cat3.size() == 2);
 	BOOST_CHECK(cat3.size() == 2);
 	
 	
-	int id, num;
-	std::string name;
-	cif::tie(id, name, num) = cat3.front().get("id", "name", "num");
-	BOOST_CHECK(id == 1);
-	BOOST_CHECK(num == 1);
-	BOOST_CHECK(name == "aapje");
-
-	cif::tie(id, name, num) = cat3.back().get("id", "name", "num");
-	BOOST_CHECK(id == 2);
-	BOOST_CHECK(num == 2);
-	BOOST_CHECK(name == "aap");
+	{
+		int id, num;
+		std::string name;
+		cif::tie(id, name, num) = cat3.front().get("id", "name", "num");
+		BOOST_CHECK(id == 1);
+		BOOST_CHECK(num == 1);
+		BOOST_CHECK(name == "aapje");
+
+		cif::tie(id, name, num) = cat3.back().get("id", "name", "num");
+		BOOST_CHECK(id == 2);
+		BOOST_CHECK(num == 2);
+		BOOST_CHECK(name == "aap");
+	}
 	
 	
 	int i = 0;	
 	int i = 0;	
 	for (const auto &[id, name, num, desc]: cat2.rows<int,std::string,int,std::string>({"id", "name", "num", "desc"}))
 	for (const auto &[id, name, num, desc]: cat2.rows<int,std::string,int,std::string>({"id", "name", "num", "desc"}))