8000 cleanup · lava/matplotlib-cpp@ce6598a · GitHub
[go: up one dir, main page]
Skip to content

Commit ce6598a

Browse files
jonarriza96jonarriza96
committed
cleanup
1 parent ef0383f commit ce6598a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+46
-1233
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@
3636

3737
# vim temp files
3838
*.sw*
39+
40+
# CMake
41+
build/

‎.travis.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎CMakeLists.txt

Lines changed: 17 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,24 @@
1-
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
2-
project(matplotlib_cpp LANGUAGES CXX)
1+
# CMakeLists.txt
2+
cmake_minimum_required(VERSION 3.15)
3+
project("example" LANGUAGES CXX)
34

4-
include(GNUInstallDirs)
5-
set(PACKAGE_NAME matplotlib_cpp)
6-
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}/cmake)
75

6+
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "No dev warnings") # bypass dev warnings
87

9-
# Library target
10-
add_library(matplotlib_cpp INTERFACE)
11-
target_include_directories(matplotlib_cpp
12-
INTERFACE
13-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/examples>
14-
$<INSTALL_INTERFACE:include>
15-
)
16-
target_compile_features(matplotlib_cpp INTERFACE
17-
cxx_std_11
18-
)
19-
# TODO: Use `Development.Embed` component when requiring cmake >= 3.18
20-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
21-
target_link_libraries(matplotlib_cpp INTERFACE
22-
Python3::Python
23-
Python3::Module
24-
)
25-
find_package(Python3 COMPONENTS NumPy)
26-
if(Python3_NumPy_FOUND)
27-
target_link_libraries(matplotlib_cpp INTERFACE
28-
Python3::NumPy
29-
)
30-
else()
31-
target_compile_definitions(matplotlib_cpp INTERFACE WITHOUT_NUMPY)
32-
endif()
33-
install(
34-
TARGETS matplotlib_cpp
35-
EXPORT install_targets
36-
)
8+
# find python libraries
9+
find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
10+
find_package(PythonLibs 3.0 REQUIRED)
11+
include_directories(${PYTHON3_INCLUDE_DIRS} ${NumPy_INCLUDE_DIRS})
3712

13+
# populate matplotlib repository
14+
include_directories(include/)
3815

39-
# Examples
16+
# add executable
4017
add_executable(minimal examples/minimal.cpp)
41-
target_link_libraries(minimal PRIVATE matplotlib_cpp)
42-
set_target_properties(minimal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
4318

44-
add_executable(basic examples/basic.cpp)
45-
target_link_libraries(basic PRIVATE matplotlib_cpp)
46-
set_target_properties(basic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
47-
48-
add_executable(modern examples/modern.cpp)
49-
target_link_libraries(modern PRIVATE matplotlib_cpp)
50-
set_target_properties(modern PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
51-
52-
add_executable(animation examples/animation.cpp)
53-
target_link_libraries(animation PRIVATE matplotlib_cpp)
54-
set_target_properties(animation PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
55-
56-
add_executable(nonblock examples/nonblock.cpp)
57-
target_link_libraries(nonblock PRIVATE matplotlib_cpp)
58-
set_target_properties(nonblock PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
59-
60-
add_executable(xkcd examples/xkcd.cpp)
61-
target_link_libraries(xkcd PRIVATE matplotlib_cpp)
62-
set_target_properties(xkcd PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
63-
64-
add_executable(bar examples/bar.cpp)
65-
target_link_libraries(bar PRIVATE matplotlib_cpp)
66-
set_target_properties(bar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
67-
68-
add_executable(fill_inbetween examples/fill_inbetween.cpp)
69-
target_link_libraries(fill_inbetween PRIVATE matplotlib_cpp)
70-
set_target_properties(fill_inbetween PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
71-
72-
add_executable(fill examples/fill.cpp)
73-
target_link_libraries(fill PRIVATE matplotlib_cpp)
74-
set_target_properties(fill PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
75-
76-
add_executable(update examples/update.cpp)
77-
target_link_libraries(update PRIVATE matplotlib_cpp)
78-
set_target_properties(update PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
79-
80-
add_executable(subplot2grid examples/subplot2grid.cpp)
81-
target_link_libraries(subplot2grid PRIVATE matplotlib_cpp)
82-
set_target_properties(subplot2grid PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
83-
84-
add_executable(lines3d examples/lines3d.cpp)
85-
target_link_libraries(lines3d PRIVATE matplotlib_cpp)
86-
set_target_properties(lines3d PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
87-
88-
if(Python3_NumPy_FOUND)
89-
add_executable(surface examples/surface.cpp)
90-
target_link_libraries(surface PRIVATE matplotlib_cpp)
91-
set_target_properties(surface PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
92-
93-
add_executable(colorbar examples/colorbar.cpp)
94-
target_link_libraries(colorbar PRIVATE matplotlib_cpp)
95-
set_target_properties(colorbar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
96-
add_executable(contour examples/contour.cpp)
97-
target_link_libraries(contour PRIVATE matplotlib_cpp)
98-
set_target_properties(contour PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
99-
100-
add_executable(spy examples/spy.cpp)
101-
target_link_libraries(spy PRIVATE matplotlib_cpp)
102-
set_target_properties(spy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
103-
endif()
104-
105-
106-
# Install headers
107-
install(FILES
108-
"${PROJECT_SOURCE_DIR}/matplotlibcpp.h"
109-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
110-
111-
112-
# Install targets file
113-
install(EXPORT install_targets
114-
FILE
115-
${PACKAGE_NAME}Targets.cmake
116-
NAMESPACE
117-
${PACKAGE_NAME}::
118-
DESTINATION
119-
${INSTALL_CONFIGDIR}
120-
)
121-
122-
123-
# Install matplotlib_cppConfig.cmake
124-
include(CMakePackageConfigHelpers)
125-
configure_package_config_file(
126-
${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PACKAGE_NAME}Config.cmake.in
127-
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
128-
INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
129-
)
130-
install(FILES
131-
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
132-
DESTINATION ${INSTALL_CONFIGDIR}
133-
)
19+
# link python and numpy
20+
target_link_libraries(minimal
21+
PRIVATE
22+
${PYTHON_LIBRARIES}
23+
Python3::NumPy
24+
)

‎LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎LICENSE.matplotlib

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0