lava · Romop5 · Feb 18, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.0)
+
+find_package(PythonLibs REQUIRED)
+
+add_library(matplotlibcpp INTERFACE)
+target_include_directories(matplotlibcpp INTERFACE include)
+target_include_directories(matplotlibcpp INTERFACE ${PYTHON_INCLUDE_DIRS})
+target_link_libraries(matplotlibcpp INTERFACE ${PYTHON_LIBRARIES})
+
+option(MATPLOTLIBCPP_EXAMPLES "Build matplotlib examples" OFF)
+
+if(MATPLOTLIBCPP_EXAMPLES)
+    set (CMAKE_CXX_STANDARD 11)
+
+    add_executable(minimal "examples/minimal.cpp")
+    target_link_libraries(minimal matplotlibcpp)
+    target_compile_definitions(minimal PRIVATE "-DWITHOUT_NUMPY")
+
+    add_executable(basic "examples/basic.cpp")
+    target_link_libraries(basic matplotlibcpp)
+
+    add_executable(modern "examples/modern.cpp")
+    target_link_libraries(modern matplotlibcpp)
+
+    add_executable(animation "examples/animation.cpp")
+    target_link_libraries(animation matplotlibcpp)
+
+    add_executable(nonblock "examples/nonblock.cpp")
+    target_link_libraries(nonblock matplotlibcpp)
+
+    add_executable(xkcd "examples/xkcd.cpp")
+    target_link_libraries(xkcd matplotlibcpp)
+
+endif(MATPLOTLIBCPP_EXAMPLES)
diff --git a/Makefile b/Makefile
@@ -1,22 +1,22 @@
 examples: minimal basic modern animation nonblock xkcd
 
-minimal: examples/minimal.cpp matplotlibcpp.h
-	cd examples && g++ -DWITHOUT_NUMPY minimal.cpp -I/usr/include/python2.7 -lpython2.7 -o minimal -std=c++11
+minimal: examples/minimal.cpp ./include/matplotlibcpp.h
+	cd examples && g++ -DWITHOUT_NUMPY minimal.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o minimal -std=c++11
 
-basic: examples/basic.cpp matplotlibcpp.h
-	cd examples && g++ basic.cpp -I/usr/include/python2.7 -lpython2.7 -o basic
+basic: examples/basic.cpp ./include/matplotlibcpp.h
+	cd examples && g++ basic.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o basic
 
-modern: examples/modern.cpp matplotlibcpp.h
-	cd examples && g++ modern.cpp -I/usr/include/python2.7 -lpython2.7 -o modern -std=c++11
+modern: examples/modern.cpp ./include/matplotlibcpp.h
+	cd examples && g++ modern.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o modern -std=c++11
 
-animation: examples/animation.cpp matplotlibcpp.h
-	cd examples && g++ animation.cpp -I/usr/include/python2.7 -lpython2.7 -o animation -std=c++11
+animation: examples/animation.cpp ./include/matplotlibcpp.h
+	cd examples && g++ animation.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o animation -std=c++11
 
-nonblock: examples/nonblock.cpp matplotlibcpp.h
-	cd examples && g++ nonblock.cpp -I/usr/include/python2.7 -lpython2.7 -o nonblock -std=c++11
+nonblock: examples/nonblock.cpp ./include/matplotlibcpp.h
+	cd examples && g++ nonblock.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o nonblock -std=c++11
 
-xkcd: examples/xkcd.cpp matplotlibcpp.h
-	cd examples && g++ xkcd.cpp -I/usr/include/python2.7 -lpython2.7 -o xkcd -std=c++11
+xkcd: examples/xkcd.cpp ./include/matplotlibcpp.h
+	cd examples && g++ xkcd.cpp -I../include -I/usr/include/python2.7 -lpython2.7 -o xkcd -std=c++11
 
 clean:
 	rm -f examples/{minimal,basic,modern,animation,nonblock,xkcd}
diff --git a/examples/animation b/examples/animation
diff --git a/examples/animation.cpp b/examples/animation.cpp
@@ -1,6 +1,6 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 
 namespace plt = matplotlibcpp;
 

diff --git a/examples/basic b/examples/basic
diff --git a/examples/basic.cpp b/examples/basic.cpp
@@ -1,7 +1,7 @@
 #define _USE_MATH_DEFINES
 #include <iostream>
 #include <cmath>
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 
 namespace plt = matplotlibcpp;
 

diff --git a/examples/minimal b/examples/minimal
diff --git a/examples/minimal.cpp b/examples/minimal.cpp
@@ -1,4 +1,4 @@
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 
 namespace plt = matplotlibcpp;
 

diff --git a/examples/modern b/examples/modern
diff --git a/examples/modern.cpp b/examples/modern.cpp
@@ -1,6 +1,6 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 
 using namespace std;
 namespace plt = matplotlibcpp;

diff --git a/examples/nonblock b/examples/nonblock
diff --git a/examples/nonblock.cpp b/examples/nonblock.cpp
@@ -1,6 +1,6 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 
 namespace plt = matplotlibcpp;
 

diff --git a/examples/xkcd b/examples/xkcd
diff --git a/examples/xkcd.cpp b/examples/xkcd.cpp
@@ -1,4 +1,4 @@
-#include "../matplotlibcpp.h"
+#include "matplotlibcpp.h"
 #include <vector>
 #include <cmath>
 

diff --git a/matplotlibcpp.h → include/matplotlibcpp.h b/matplotlibcpp.h → include/matplotlibcpp.h