build system simplifications & a few fixes for msvc

Author: wjakob

CMakeLists.txt

@@ -51,9 +51,9 @@ template <typename T> constexpr VariableType get_type() {
             return VariableType::Float32;
         else if constexpr (sizeof(T) == 8)
             return VariableType::Float64;
+    } else {
+        return VariableType::Invalid;
     }
-
-    return VariableType::Invalid;
 }
 
 /// Return the size in bytes associated with a specific variable type

ext/glfw

@@ -339,7 +339,7 @@ class Color : public Vector4f {
      * \param alpha
      * The alpha component of the color, will be divided by ``255.0``.
      */
-    Color(size_t intensity, int alpha)
+    Color(int intensity, int alpha)
         : Color(Vector3i(intensity), alpha) { }
 
     /**

ext/pybind11

@@ -0,0 +1,54 @@
+if (NOT NANOGUI_BUILD_SHARED)
+  # Need PIC code in libnanogui & GLFW even when compiled as a static library
+  set_target_properties(nanogui PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+  if (NANOGUI_BUILD_GLFW)
+    set_target_properties(glfw_objects PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  endif()
+endif()
+
+if (NANOGUI_BUILD_PYTHON AND (APPLE OR CMAKE_SYSTEM MATCHES "Linux"))
+  # Include coroutine support for running the mainloop in detached mode
+  add_definitions(-DCORO_SJLJ)
+  include_directories(../ext/coro)
+  set(NANOGUI_PYTHON_EXTRA ../ext/coro/coro.c)
+endif()
+
+add_definitions(-DNANOGUI_PYTHON)
+
+pybind11_add_module(nanogui-python MODULE THIN_LTO OPT_SIZE
+  main.cpp
+  glfw.cpp
+  icons.cpp
+  color.cpp
+  widget.cpp
+  layout.cpp
+  basics.cpp
+  button.cpp
+  tabs.cpp
+  textbox.cpp
+  textarea.cpp
+  theme.cpp
+  formhelper.cpp
+  misc.cpp
+  canvas.cpp
+  nanovg.cpp
+  render.cpp
+  vector.cpp
+  python.h
+  py_doc.h
+  ${NANOGUI_PYTHON_EXTRA})
+
+set_target_properties(nanogui-python PROPERTIES OUTPUT_NAME nanogui)
+target_link_libraries(nanogui-python PRIVATE nanogui)
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  # Quench warnings on GCC
+  target_compile_options(nanogui-python PRIVATE -Wno-unused-variable)
+endif()
+
+if (NANOGUI_INSTALL)
+  install(TARGETS nanogui-python
+          LIBRARY DESTINATION lib
+          ARCHIVE DESTINATION lib)
+endif()

include/nanogui/traits.h

@@ -71,6 +71,8 @@ static py::array texture_download(Texture &texture) {
         case Texture::ComponentFormat::Int32:   dtype_name = "i4"; break;
         case Texture::ComponentFormat::Float16: dtype_name = "f2"; break;
         case Texture::ComponentFormat::Float32: dtype_name = "f4"; break;
+        default:
+            throw std::runtime_error("Invalid component format");
     }
 
     py::array result(

include/nanogui/vector.h

@@ -6,6 +6,7 @@
 #if defined(__clang__)
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Wself-assign-overloaded"
+#  pragma clang diagnostic ignored "-Wunused-lambda-capture"
 #endif
 
 template <typename Array>

python/CMakeLists.txt

@@ -41,6 +41,11 @@
 
 #define STB_IMAGE_STATIC
 #define STB_IMAGE_IMPLEMENTATION
+#if defined(_MSC_VER)
+#  pragma warning (disable: 4505) // don't warn about dead code in stb_image.h
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 #include <stb_image.h>
 
 using namespace nanogui;