Skip to content

Commit ceed965

Browse files
committed
Forgot to publish these.
1 parent 8cfd2fd commit ceed965

File tree

1 file changed

+9
-40
lines changed

1 file changed

+9
-40
lines changed

CMakeLists.txt

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,16 @@ else()
2626
add_compile_options(-Wall -Wextra -pedantic -Werror)
2727
endif()
2828

29-
set( version 0.1.0 )
29+
set( version 0.3.0 )
3030

31-
# mainframe_base =============================================================
31+
# mainframe ==================================================================
3232

33-
add_library( mainframe_base STATIC
33+
add_library( mainframe STATIC
3434
mainframe/base.hpp
3535
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
4736
mainframe/series.hpp
4837
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
6539
mainframe/frame.hpp
6640
mainframe/expression.hpp
6741
mainframe/csv.cpp
@@ -77,16 +51,10 @@ target_include_directories( mainframe
7751
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
7852
)
7953

80-
target_link_libraries( mainframe
81-
PUBLIC
82-
mainframe_base
83-
mainframe_series
84-
)
85-
8654
# cmake bric-a-brac ==========================================================
8755

8856
# install the target and create the export-set
89-
install( TARGETS mainframe mainframe_series mainframe_base
57+
install( TARGETS mainframe
9058
EXPORT mainframe-targets
9159
LIBRARY DESTINATION lib
9260
ARCHIVE DESTINATION lib
@@ -97,11 +65,12 @@ install( TARGETS mainframe mainframe_series mainframe_base
9765
# install header files
9866
install(
9967
FILES
100-
mainframe/frame.hpp
101-
mainframe/expression.hpp
68+
mainframe/base.hpp
10269
mainframe/series.hpp
10370
mainframe/series_vector.hpp
104-
mainframe/base.hpp
71+
mainframe/missing.hpp
72+
mainframe/frame.hpp
73+
mainframe/expression.hpp
10574
DESTINATION include/mainframe
10675
)
10776

0 commit comments

Comments
 (0)