Threaded server/display mode (for real this time)

CHANGELOG

@@ -11,6 +11,13 @@
 
 Version 4.0.1 (development)
 ===========================
+- Use threads in server mode for window creation and session management
+  instead of fork(). This resolves some issues with running GLVis in server
+  mode on macOS. This also allows for closing all open GLVis windows associated
+  with the server by using Ctrl-C in the terminal.
+
+- Preliminary support for building natively on Windows via CMake.
+
 - Refactored glvis.cpp to fix a bug in GLVis script handling.
 
 - Enabled support for WebGL 2, when available. This enables, among other

CMakeLists.txt

@@ -88,6 +88,11 @@ set(_glvis_libraries)
 
 list(APPEND _glvis_compile_defs "GLVIS_MULTISAMPLE=${GLVIS_MULTISAMPLE}")
 list(APPEND _glvis_compile_defs "GLVIS_MS_LINEWIDTH=${GLVIS_MS_LINEWIDTH}")
+if (NOT WIN32)
+  list(APPEND _glvis_compile_defs "GLVIS_USE_LOGO")
+else()
+  list(APPEND _glvis_compile_defs "_USE_MATH_DEFINES")
+endif()
 
 if (CMAKE_BUILD_TYPE MATCHES "Debug|debug|DEBUG")
   list(APPEND _glvis_compile_defs "GLVIS_DEBUG")
@@ -111,7 +116,9 @@ if (NOT EMSCRIPTEN)
   find_package(SDL2 QUIET HINTS ${SDL2_DIR})
   # The SDL2 target 'SDL2::SDL2' is not always defined, so instead we use
   # directly 'SDL2_INCLUDE_DIRS' and 'SDL2_LIBRARIES'.
-  if (SDL2_INCLUDE_DIRS AND SDL2_LIBRARIES)
+  if (TARGET SDL2::SDL2)
+    list(APPEND _glvis_libraries SDL2::SDL2)
+  elseif (SDL2_INCLUDE_DIRS AND SDL2_LIBRARIES)
     # SDL2_INCLUDE_DIRS is defined with 'SDL2' at the end of the path we need to
     # strip that.
     set(new_list_)
@@ -120,6 +127,8 @@ if (NOT EMSCRIPTEN)
       list(APPEND new_list_ "${new_path_}")
     endforeach()
     set(SDL2_INCLUDE_DIRS ${new_list_})
+    list(APPEND _glvis_include_dirs "${SDL2_INCLUDE_DIRS}")
+    list(APPEND _glvis_libraries "${SDL2_LIBRARIES}")
   else()
     # find_package() did not work; try more direct approach.
     set(SDL2_DIR ${SDL2_DIR_SAVE})
@@ -134,9 +143,9 @@ if (NOT EMSCRIPTEN)
     if (NOT (SDL2_INCLUDE_DIRS AND SDL2_LIBRARIES))
       message(FATAL_ERROR "SDL2 library not found. Please set SDL2_DIR.")
     endif()
+    list(APPEND _glvis_include_dirs "${SDL2_INCLUDE_DIRS}")
+    list(APPEND _glvis_libraries "${SDL2_LIBRARIES}")
   endif()
-  list(APPEND _glvis_include_dirs "${SDL2_INCLUDE_DIRS}")
-  list(APPEND _glvis_libraries "${SDL2_LIBRARIES}")
   message(STATUS "SDL2 found: ${SDL2_LIBRARIES}")
   message(STATUS "SDL2_INCLUDE_DIRS = ${SDL2_INCLUDE_DIRS}")
 
@@ -204,12 +213,14 @@ if (NOT EMSCRIPTEN)
   endif (FONTCONFIG_LIBRARY)
 
   # Find threading library
-  set(CMAKE_THREAD_PREFER_PTHREAD ON)
   find_package(Threads REQUIRED)
-  if (NOT CMAKE_USE_PTHREADS_INIT)
-    message(FATAL_ERROR "The required pthreads library was not found.")
-  else()
-    list(APPEND _glvis_libraries "${CMAKE_THREAD_LIBS_INIT}")
+  list(APPEND _glvis_libraries "${CMAKE_THREAD_LIBS_INIT}")
+  if (CMAKE_USE_PTHREADS_INIT)
+    message(STATUS "System threading library: pthreads")
+  elseif (CMAKE_USE_WIN32_THREADS_INIT)
+    message(STATUS "System threading library: Win32 threads")
+  elseif (Threads_FOUND)
+    message(STATUS "System threading library: other")
   endif()
 
 else(NOT EMSCRIPTEN)
@@ -223,6 +234,8 @@ else(NOT EMSCRIPTEN)
   # OpenGL, SDL2, and GLEW are provided by the Emscripten runtime
   # Enable SDL2
   list(APPEND _emscripten_opts "-s USE_SDL=2")
+  list(APPEND _emscripten_opts
+      "-s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0")
 
   # Set WebGL options
   list(APPEND _emscripten_opts
@@ -274,7 +287,15 @@ if(NOT EMSCRIPTEN)
   add_executable(glvis-exe glvis.cpp)
   set_target_properties(glvis-exe PROPERTIES OUTPUT_NAME glvis)
 
-  target_link_libraries(glvis-exe PRIVATE glvis glvis_logo)
+  target_link_libraries(glvis-exe PRIVATE glvis)
+
+  if (WIN32)
+    set_target_properties(glvis-exe PROPERTIES WIN32_EXECUTABLE TRUE)
+    target_sources(glvis-exe PRIVATE "share/windows.manifest")
+    target_link_libraries(glvis-exe PRIVATE SDL2::SDL2main)
+  else()
+    target_link_libraries(glvis-exe PRIVATE glvis_logo)
+  endif (WIN32)
 
   # Install the executable
   install(TARGETS glvis-exe RUNTIME DESTINATION bin)