clean up warning on Windows, start using resources on Windows

6b16e02b · Maarten L. Hekkelman · bb2f8131 · 6b16e02b · bb2f8131 · bb2f8131
Commit 6b16e02b authored Aug 12, 2021 by Maarten L. Hekkelman
14 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,30 @@ project(cifpp VERSION 1.1.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(MSVC)
+    # make msvc standards compliant...
+    add_compile_options(/permissive-)
+	# On Windows, do not install in the system location
+	if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+		message(WARNING "The library and auxiliary files will be installed in $ENV{LOCALAPPDATA}/${PROJECT_NAME}")
+		set(CMAKE_INSTALL_PREFIX "$ENV{LOCALAPPDATA}/${PROJECT_NAME}" CACHE PATH "..." FORCE)
+	endif()
+	# Find out the processor type for the target
+	if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+		set(COFF_TYPE "x64")
+	elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
+		set(COFF_TYPE "x86")
+	elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64")
+		set(COFF_TYPE "arm64")
+	else()
+		message(FATAL_ERROR "Unsupported or unknown processor type ${CMAKE_SYSTEM_PROCESSOR}")
+	endif()	
+	set(COFF_SPEC "--coff=${COFF_TYPE}")
+endif()
 # Set sharedir, if not use -DSHARE_INSTALL_DIR
 if(NOT SHARE_INSTALL_DIR)
  if(CMAKE_INSTALL_DATADIR)
@@ -16,10 +40,6 @@ if(NOT SHARE_INSTALL_DIR)
 endif(NOT SHARE_INSTALL_DIR)
 set (Boost_DETAILED_FAILURE_MSG ON)
-# set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/../boost_1_75_0)
-# set (Boost_COMPILER "-vc")
-# set (Boost_USE_STATIC_RUNTIME ON)  
 find_package(Boost 1.73.0 REQUIRED COMPONENTS system iostreams regex date_time)
 set(CMAKE_THREAD_PREFER_PTHREAD)
@@ -29,6 +49,19 @@ find_package(Threads)
 find_package(ZLIB)
 find_package(BZip2)
+find_program(MRC mrc HINTS "${CMAKE_INSTALL_PREFIX}/../mrc")
+if(MRC)
+	option(USE_RSRC "Use mrc to create resources" ON)
+else()
+	message(WARNING "Not using resources since mrc was not found")
+endif()
+if(USE_RSRC)
+	message("Using resources compiled with ${MRC}")
+	add_compile_definitions(USE_RSRC)
+endif()
 set(project_sources 
 	${PROJECT_SOURCE_DIR}/src/AtomType.cpp
 	${PROJECT_SOURCE_DIR}/src/BondMap.cpp
@@ -83,22 +116,20 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/data/components.cif)
 		SHOW_PROGRESS)
 endif()
-add_library(${PROJECT_NAME} ${project_sources} ${project_headers})
+include_directories(${Boost_INCLUDE_DIRS})
-add_executable(unit-test ${PROJECT_SOURCE_DIR}/test/unit-test.cpp)
+link_libraries(${Boost_LIBRARIES})
+add_compile_definitions(CACHE_DIR="${SHARE_INSTALL_DIR}/libcifpp" DATA_DIR="${SHARE_INSTALL_DIR}/libcifpp" )
-configure_file(${PROJECT_SOURCE_DIR}/src/Config.hpp.in Config.hpp)
-target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
-include_directories(${PROJECT_NAME} PUBLIC ${Boost_INCLUDE_DIRS})
+if(USE_RSRC STREQUAL "ON")
-link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
+	set(USE_RSRC 1)
+endif()
+configure_file(${PROJECT_SOURCE_DIR}/src/Config-cmake.hpp.in Config.hpp)
-target_compile_definitions(${PROJECT_NAME}
+add_library(${PROJECT_NAME} ${project_sources} ${project_headers})
-	PUBLIC "" CACHE_DIR="${SHARE_INSTALL_DIR}/libcifpp" DATA_DIR="${SHARE_INSTALL_DIR}/libcifpp" )
+add_executable(unit-test ${PROJECT_SOURCE_DIR}/test/unit-test.cpp Config.hpp)
-target_compile_definitions(unit-test
-	PUBLIC "" CACHE_DIR="${SHARE_INSTALL_DIR}/libcifpp" DATA_DIR="${SHARE_INSTALL_DIR}/libcifpp" )
-target_link_libraries(unit-test ${PROJECT_NAME} ${Boost_LIBRARIES} Threads::Threads)
+target_link_libraries(unit-test ${PROJECT_NAME} Threads::Threads)
 if(${ZLIB_FOUND})
 	target_link_libraries(unit-test ZLIB::ZLIB)
@@ -108,12 +139,6 @@ if(${BZip2_FOUND})
 	target_link_libraries(unit-test BZip2::BZip2)
 endif()
-if(MSVC)
-    # make msvc standards compliant...
-    target_compile_options(${PROJECT_NAME} PRIVATE /permissive-)
-    target_compile_options(unit-test PRIVATE /permissive-)
-endif()
 include(GenerateExportHeader)
 generate_export_header(cifpp)
@@ -139,7 +164,7 @@ install(
 install(
 	FILES "${CMAKE_CURRENT_BINARY_DIR}/cifpp_export.h"
-	DESTINATION include
+	DESTINATION include/cif++
 	COMPONENT Devel
 )
@@ -155,9 +180,11 @@ include(CMakePackageConfigHelpers)
 set(INCLUDE_INSTALL_DIR include )
 set(LIBRARY_INSTALL_DIR lib )
+set(ConfigPackageLocation lib/cmake/cifpp)
 configure_package_config_file(cmake/cifppConfig.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake
-  INSTALL_DESTINATION lib/cmake/cifpp
+  INSTALL_DESTINATION ${ConfigPackageLocation}
  PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR SHARE_INSTALL_DIR)
 write_basic_package_version_file(
@@ -171,22 +198,17 @@ export(EXPORT cifppTargets
  NAMESPACE cifpp::
 )
-set(ConfigPackageLocation lib/cmake/cifpp)
 install(EXPORT cifppTargets
-  FILE
+  FILE cifppTargets.cmake
-    cifppTargets.cmake
+  NAMESPACE cifpp::
-  NAMESPACE
+  DESTINATION ${ConfigPackageLocation}
-    cifpp::
+  COMPONENT Devel
-  DESTINATION
-    ${ConfigPackageLocation}
 )
 install(
  FILES
 	"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake"
 	"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfigVersion.cmake"
-  DESTINATION
+  DESTINATION ${ConfigPackageLocation}
-    ${ConfigPackageLocation}
+  COMPONENT Devel
-  COMPONENT
-    Devel
 )
--- a/msvc/libcifpp.sln
+++ b/msvc/libcifpp.sln
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31025.194
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcifpp", "libcifpp.vcxproj", "{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit-test", "unit-test\unit-test.vcxproj", "{538DE409-6F41-497A-99CC-D5E224455B08}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Debug|x64.ActiveCfg = Debug|x64
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Debug|x64.Build.0 = Debug|x64
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Debug|x86.ActiveCfg = Debug|Win32
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Debug|x86.Build.0 = Debug|Win32
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Release|x64.ActiveCfg = Release|x64
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Release|x64.Build.0 = Release|x64
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Release|x86.ActiveCfg = Release|Win32
-		{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}.Release|x86.Build.0 = Release|Win32
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Debug|x64.ActiveCfg = Debug|x64
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Debug|x64.Build.0 = Debug|x64
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Debug|x86.ActiveCfg = Debug|Win32
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Debug|x86.Build.0 = Debug|Win32
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Release|x64.ActiveCfg = Release|x64
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Release|x64.Build.0 = Release|x64
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Release|x86.ActiveCfg = Release|Win32
-		{538DE409-6F41-497A-99CC-D5E224455B08}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {80B10737-8834-42D8-B4D7-0FCDB1BAE3A0}
-	EndGlobalSection
-EndGlobal
--- a/msvc/libcifpp.vcxproj
+++ b/msvc/libcifpp.vcxproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{F1DDF46A-A0D7-4FB7-870F-B57FE038F041}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\boost_1_75_0</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\boost_1_75_0</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\..\boost_1_75_0;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\..\boost_1_75_0;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <EnableModules>true</EnableModules>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <EnableModules>true</EnableModules>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\AtomType.cpp" />
-    <ClCompile Include="..\src\BondMap.cpp" />
-    <ClCompile Include="..\src\Cif++.cpp" />
-    <ClCompile Include="..\src\Cif2PDB.cpp" />
-    <ClCompile Include="..\src\CifParser.cpp" />
-    <ClCompile Include="..\src\CifUtils.cpp" />
-    <ClCompile Include="..\src\CifValidator.cpp" />
-    <ClCompile Include="..\src\Compound.cpp" />
-    <ClCompile Include="..\src\PDB2Cif.cpp" />
-    <ClCompile Include="..\src\PDB2CifRemark3.cpp" />
-    <ClCompile Include="..\src\Point.cpp" />
-    <ClCompile Include="..\src\Secondary.cpp" />
-    <ClCompile Include="..\src\Structure.cpp" />
-    <ClCompile Include="..\src\Symmetry.cpp" />
-    <ClCompile Include="..\src\SymOpTable_data.cpp" />
-    <ClCompile Include="..\src\TlsParser.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\cif++\AtomType.hpp" />
-    <ClInclude Include="..\include\cif++\Cif++.hpp" />
-    <ClInclude Include="..\include\cif++\Cif2PDB.hpp" />
-    <ClInclude Include="..\include\cif++\CifParser.hpp" />
-    <ClInclude Include="..\include\cif++\CifUtils.hpp" />
-    <ClInclude Include="..\include\cif++\CifValidator.hpp" />
-    <ClInclude Include="..\include\cif++\Compound.hpp" />
-    <ClInclude Include="..\include\cif++\PDB2Cif.hpp" />
-    <ClInclude Include="..\include\cif++\PDB2CifRemark3.hpp" />
-    <ClInclude Include="..\include\cif++\Point.hpp" />
-    <ClInclude Include="..\include\cif++\Secondary.hpp" />
-    <ClInclude Include="..\include\cif++\Structure.hpp" />
-    <ClInclude Include="..\include\cif++\Symmetry.hpp" />
-    <ClInclude Include="..\include\cif++\TlsParser.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc/libcifpp.vcxproj.filters
+++ b/msvc/libcifpp.vcxproj.filters
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\AtomType.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Cif++.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Cif2PDB.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\CifParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\CifUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\CifValidator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Compound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\PDB2Cif.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\PDB2CifRemark3.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Point.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Secondary.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Structure.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Symmetry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\SymOpTable_data.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\TlsParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\cif++\AtomType.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Cif++.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Cif2PDB.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\CifParser.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\CifUtils.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\CifValidator.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Compound.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\PDB2Cif.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\PDB2CifRemark3.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Point.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Secondary.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Structure.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\Symmetry.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\cif++\TlsParser.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
--- a/msvc/libcifpp.vcxproj.user
+++ b/msvc/libcifpp.vcxproj.user
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
--- a/msvc/unit-test/unit-test.vcxproj
+++ b/msvc/unit-test/unit-test.vcxproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\unit-test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libcifpp.vcxproj">
-      <Project>{f1ddf46a-a0d7-4fb7-870f-b57fe038f041}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{538de409-6f41-497a-99cc-d5e224455b08}</ProjectGuid>
-    <RootNamespace>unit_test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\boost_1_75_0</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)\..\..\boost_1_75_0\stage\lib</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\boost_1_75_0</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)\..\..\boost_1_75_0\stage\lib</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc/unit-test/unit-test.vcxproj.filters
+++ b/msvc/unit-test/unit-test.vcxproj.filters
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\unit-test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
--- a/msvc/unit-test/unit-test.vcxproj.user
+++ b/msvc/unit-test/unit-test.vcxproj.user
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
--- a/src/AtomType.cpp
+++ b/src/AtomType.cpp
--- a/src/Cif++.cpp
+++ b/src/Cif++.cpp
@@ -436,7 +436,7 @@ void Datablock::setValidator(Validator* v)
 void Datablock::add_software(const std::string& name, const std::string& classification, const std::string& versionNr, const std::string& versionDate)
 {
 	Category& cat = operator[]("software");
-	int ordNr = cat.size() + 1;
+	auto ordNr = cat.size() + 1;
 	// TODO: should we check this ordinal number???
 	cat.emplace({

--- a/src/CifParser.cpp
+++ b/src/CifParser.cpp
@@ -1235,7 +1235,7 @@ void DictParser::loadDictionary()
 			}
 		}
 	}
-	catch (const std::exception& ex)
+	catch (const std::exception&)
 	{
 		std::cerr << "Error parsing dictionary" << std::endl;
 		throw;
@@ -1303,7 +1303,7 @@ bool DictParser::collectItemTypes()
 			mValidator.addTypeValidator(std::move(v));
 		}
-		catch (const std::exception& ex)
+		catch (const std::exception&)
 		{
 			throw_with_nested(CifParserError(t.lineNr(), "error in regular expression"));
 		}

--- a/src/CifUtils.cpp
+++ b/src/CifUtils.cpp
@@ -820,9 +820,25 @@ struct rsrc_imp
 };
 } // namespace mrsrc
+#if _MSC_VER
+extern "C" const mrsrc::rsrc_imp* gResourceIndexDefault = nullptr;
+extern "C" const char* gResourceDataDefault = nullptr;
+extern "C" const char* gResourceNameDefault = nullptr;
+extern "C" const mrsrc::rsrc_imp* gResourceIndex;
+extern "C" const char* gResourceData;
+extern "C" const char* gResourceName;
+#pragma comment(linker, "/alternatename:gResourceIndex=gResourceIndexDefault")
+#pragma comment(linker, "/alternatename:gResourceData=gResourceDataDefault")
+#pragma comment(linker, "/alternatename:gResourceName=gResourceNameDefault")
+#else
 extern const __attribute__((weak)) mrsrc::rsrc_imp gResourceIndex[];
 extern const __attribute__((weak)) char gResourceData[];
 extern const __attribute__((weak)) char gResourceName[];
+#endif
 namespace mrsrc
 {

--- a/src/Compound.cpp
+++ b/src/Compound.cpp
@@ -686,7 +686,7 @@ void CompoundFactory::setDefaultDictionary(const std::string &inDictFile)
 	{
 		mImpl.reset(new CCDCompoundFactoryImpl(mImpl, inDictFile));
 	}
-	catch (const std::exception &ex)
+	catch (const std::exception &)
 	{
 		std::cerr << "Error loading dictionary " << inDictFile << std::endl;
 		throw;
@@ -706,7 +706,7 @@ void CompoundFactory::pushDictionary(const std::string &inDictFile)
 	{
 		mImpl.reset(new CompoundFactoryImpl(inDictFile, mImpl));
 	}
-	catch (const std::exception &ex)
+	catch (const std::exception &)
 	{
 		std::cerr << "Error loading dictionary " << inDictFile << std::endl;
 		throw;

--- a/src/Config-cmake.hpp.in
+++ b/src/Config-cmake.hpp.in
+/* Define to the name of this package. */
+#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
+/* Define to the version of this package. */
+#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
+/* Define the complete package string */
+#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
+/* Using resources? */
+#cmakedefine USE_RSRC @USE_RSRC@