@@ -26,42 +26,16 @@ else()
26
26
add_compile_options (-Wall -Wextra -pedantic -Werror )
27
27
endif ()
28
28
29
- set ( version 0.1 .0 )
29
+ set ( version 0.3 .0 )
30
30
31
- # mainframe_base =============================================================
31
+ # mainframe ===== =============================================================
32
32
33
- add_library ( mainframe_base STATIC
33
+ add_library ( mainframe STATIC
34
34
mainframe/base.hpp
35
35
mainframe/base.cpp
36
- )
37
-
38
- target_include_directories ( mainframe_base
39
- PUBLIC
40
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} >"
41
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >"
42
- )
43
-
44
- # mainframe_series ===========================================================
45
-
46
- add_library ( mainframe_series STATIC
47
36
mainframe/series.hpp
48
37
mainframe/series_vector.hpp
49
- )
50
-
51
- target_include_directories ( mainframe_series
52
- PUBLIC
53
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} >"
54
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >"
55
- )
56
-
57
- target_link_libraries ( mainframe_series
58
- PUBLIC
59
- mainframe_base
60
- )
61
-
62
- # mainframe ==================================================================
63
-
64
- add_library ( mainframe STATIC
38
+ mainframe/missing.hpp
65
39
mainframe/frame.hpp
66
40
mainframe/expression.hpp
67
41
mainframe/csv.cpp
@@ -77,16 +51,10 @@ target_include_directories( mainframe
77
51
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >"
78
52
)
79
53
80
- target_link_libraries ( mainframe
81
- PUBLIC
82
- mainframe_base
83
- mainframe_series
84
- )
85
-
86
54
# cmake bric-a-brac ==========================================================
87
55
88
56
# install the target and create the export-set
89
- install ( TARGETS mainframe mainframe_series mainframe_base
57
+ install ( TARGETS mainframe
90
58
EXPORT mainframe-targets
91
59
LIBRARY DESTINATION lib
92
60
ARCHIVE DESTINATION lib
@@ -97,11 +65,12 @@ install( TARGETS mainframe mainframe_series mainframe_base
97
65
# install header files
98
66
install (
99
67
FILES
100
- mainframe/frame.hpp
101
- mainframe/expression.hpp
68
+ mainframe/base.hpp
102
69
mainframe/series.hpp
103
70
mainframe/series_vector.hpp
104
- mainframe/base.hpp
71
+ mainframe/missing.hpp
72
+ mainframe/frame.hpp
73
+ mainframe/expression.hpp
105
74
DESTINATION include /mainframe
106
75
)
107
76
0 commit comments