From 2acb4d07d263f04363a5156c28e85c142345792b Mon Sep 17 00:00:00 2001
From: Sologala <dawsonwen123@gmail.com>
Date: Wed, 8 Nov 2023 16:23:25 +0800
Subject: [PATCH 1/2] Fix subplot args convert

---
 matplotlibcpp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matplotlibcpp.h b/matplotlibcpp.h
index d95d46a..b30b87f 100644
--- a/matplotlibcpp.h
+++ b/matplotlibcpp.h
@@ -2255,9 +2255,9 @@ inline void subplot(long nrows, long ncols, long plot_number)
 
     // construct positional args
     PyObject* args = PyTuple_New(3);
-    PyTuple_SetItem(args, 0, PyFloat_FromDouble(nrows));
-    PyTuple_SetItem(args, 1, PyFloat_FromDouble(ncols));
-    PyTuple_SetItem(args, 2, PyFloat_FromDouble(plot_number));
+    PyTuple_SetItem(args, 0, PyLong_FromLong(nrows));
+    PyTuple_SetItem(args, 1, PyLong_FromLong(ncols));
+    PyTuple_SetItem(args, 2, PyLong_FromLong(plot_number));
 
     PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_subplot, args);
     if(!res) throw std::runtime_error("Call to subplot() failed.");

From 1d2560934f23004ce36764fbc8ba3698d8f6ed8f Mon Sep 17 00:00:00 2001
From: Sologala <dawsonwen123@gmail.com>
Date: Wed, 8 Nov 2023 16:59:24 +0800
Subject: [PATCH 2/2] EHN: change target_include_dir; add example compile
 option

---
 CMakeLists.txt | 133 +++++++++++++++++++++++++------------------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb2decd..edb5b61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,12 +5,13 @@ include(GNUInstallDirs)
 set(PACKAGE_NAME matplotlib_cpp)
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}/cmake)
 
+option(BUILD_EXAMPLES "Compile examples" OFF)
 
 # Library target
 add_library(matplotlib_cpp INTERFACE)
 target_include_directories(matplotlib_cpp
   INTERFACE
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/examples>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
     $<INSTALL_INTERFACE:include>
 )
 target_compile_features(matplotlib_cpp INTERFACE
@@ -35,74 +36,74 @@ install(
   EXPORT install_targets
 )
 
-
+if (BUILD_EXAMPLES)
 # Examples
-add_executable(minimal examples/minimal.cpp)
-target_link_libraries(minimal PRIVATE matplotlib_cpp)
-set_target_properties(minimal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(basic examples/basic.cpp)
-target_link_libraries(basic PRIVATE matplotlib_cpp)
-set_target_properties(basic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(modern examples/modern.cpp)
-target_link_libraries(modern PRIVATE matplotlib_cpp)
-set_target_properties(modern PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(animation examples/animation.cpp)
-target_link_libraries(animation PRIVATE matplotlib_cpp)
-set_target_properties(animation PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(nonblock examples/nonblock.cpp)
-target_link_libraries(nonblock PRIVATE matplotlib_cpp)
-set_target_properties(nonblock PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(xkcd examples/xkcd.cpp)
-target_link_libraries(xkcd PRIVATE matplotlib_cpp)
-set_target_properties(xkcd PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(bar examples/bar.cpp)
-target_link_libraries(bar PRIVATE matplotlib_cpp)
-set_target_properties(bar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(fill_inbetween examples/fill_inbetween.cpp)
-target_link_libraries(fill_inbetween PRIVATE matplotlib_cpp)
-set_target_properties(fill_inbetween PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(fill examples/fill.cpp)
-target_link_libraries(fill PRIVATE matplotlib_cpp)
-set_target_properties(fill PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(update examples/update.cpp)
-target_link_libraries(update PRIVATE matplotlib_cpp)
-set_target_properties(update PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(subplot2grid examples/subplot2grid.cpp)
-target_link_libraries(subplot2grid PRIVATE matplotlib_cpp)
-set_target_properties(subplot2grid PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(lines3d examples/lines3d.cpp)
-target_link_libraries(lines3d PRIVATE matplotlib_cpp)
-set_target_properties(lines3d PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-if(Python3_NumPy_FOUND)
-  add_executable(surface examples/surface.cpp)
-  target_link_libraries(surface PRIVATE matplotlib_cpp)
-  set_target_properties(surface PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-  add_executable(colorbar examples/colorbar.cpp)
-  target_link_libraries(colorbar PRIVATE matplotlib_cpp)
-  set_target_properties(colorbar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-  add_executable(contour examples/contour.cpp)
-  target_link_libraries(contour PRIVATE matplotlib_cpp)
-  set_target_properties(contour PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-  add_executable(spy examples/spy.cpp)
-  target_link_libraries(spy PRIVATE matplotlib_cpp)
-  set_target_properties(spy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    add_executable(minimal examples/minimal.cpp)
+    target_link_libraries(minimal PRIVATE matplotlib_cpp)
+    set_target_properties(minimal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(basic examples/basic.cpp)
+    target_link_libraries(basic PRIVATE matplotlib_cpp)
+    set_target_properties(basic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(modern examples/modern.cpp)
+    target_link_libraries(modern PRIVATE matplotlib_cpp)
+    set_target_properties(modern PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(animation examples/animation.cpp)
+    target_link_libraries(animation PRIVATE matplotlib_cpp)
+    set_target_properties(animation PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(nonblock examples/nonblock.cpp)
+    target_link_libraries(nonblock PRIVATE matplotlib_cpp)
+    set_target_properties(nonblock PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(xkcd examples/xkcd.cpp)
+    target_link_libraries(xkcd PRIVATE matplotlib_cpp)
+    set_target_properties(xkcd PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(bar examples/bar.cpp)
+    target_link_libraries(bar PRIVATE matplotlib_cpp)
+    set_target_properties(bar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(fill_inbetween examples/fill_inbetween.cpp)
+    target_link_libraries(fill_inbetween PRIVATE matplotlib_cpp)
+    set_target_properties(fill_inbetween PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(fill examples/fill.cpp)
+    target_link_libraries(fill PRIVATE matplotlib_cpp)
+    set_target_properties(fill PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(update examples/update.cpp)
+    target_link_libraries(update PRIVATE matplotlib_cpp)
+    set_target_properties(update PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(subplot2grid examples/subplot2grid.cpp)
+    target_link_libraries(subplot2grid PRIVATE matplotlib_cpp)
+    set_target_properties(subplot2grid PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(lines3d examples/lines3d.cpp)
+    target_link_libraries(lines3d PRIVATE matplotlib_cpp)
+    set_target_properties(lines3d PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    if(Python3_NumPy_FOUND)
+      add_executable(surface examples/surface.cpp)
+      target_link_libraries(surface PRIVATE matplotlib_cpp)
+      set_target_properties(surface PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+      add_executable(colorbar examples/colorbar.cpp)
+      target_link_libraries(colorbar PRIVATE matplotlib_cpp)
+      set_target_properties(colorbar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+      add_executable(contour examples/contour.cpp)
+      target_link_libraries(contour PRIVATE matplotlib_cpp)
+      set_target_properties(contour PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+      add_executable(spy examples/spy.cpp)
+      target_link_libraries(spy PRIVATE matplotlib_cpp)
+      set_target_properties(spy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    endif()
 endif()
 
-
 # Install headers
 install(FILES
   "${PROJECT_SOURCE_DIR}/matplotlibcpp.h"