Release 2023-06-12

.gitignore

@@ -39,6 +39,7 @@
 /debug/*
 /release/*
 /parasol-*/
+/visual-studio/
 
 /install/
 /packages/

3rdparty/zlib-1.2.11/CMakeLists.txt

@@ -178,37 +178,43 @@ if(MINGW)
     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW)
 
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+if (BUILD_SHARED_LIBS)
+   set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+   set_target_properties(zlib PROPERTIES SOVERSION 1)
+endif ()
+
+if (NOT CYGWIN)
+   # This property causes shared libraries on Linux to have the full version
+   # encoded into their final filename.  We disable this on Cygwin because
+   # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+   # seems to be the default.
+   #
+   # This has no effect with MSVC, on that platform the version info for
+   # the DLL comes from the resource file win32/zlib1.rc
+   set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif ()
 
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
+if (UNIX)
+   # On unix-like platforms the library is almost always called libz
    set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
-     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-   endif()
+   if (NOT APPLE)
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+   endif ()
 elseif(WIN32)
-    # Creates zlib1.dll when building shared library version
-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-endif()
+   if (BUILD_SHARED_LIBS)
+      # Creates zlib1.dll when building shared library version
+      set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+   endif ()
+endif ()
 
-install(TARGETS zlib
-    RUNTIME DESTINATION "${LIB_TARGET}/lib" # Win32 libraries are output to the runtime destination
-    ARCHIVE DESTINATION "${LIB_TARGET}/lib"
-    LIBRARY DESTINATION "${LIB_TARGET}/lib" # Linux
-)
+if (BUILD_SHARED_LIBS)
+   install(TARGETS zlib
+       RUNTIME DESTINATION "${LIB_TARGET}/lib" # Win32 libraries are output to the runtime destination
+       ARCHIVE DESTINATION "${LIB_TARGET}/lib"
+       LIBRARY DESTINATION "${LIB_TARGET}/lib" # Linux
+   )
+endif ()
 
 if (INSTALL_INCLUDES)
    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "include/parasol/3rdparty")