Skip to content

Commit b3c91ed

Browse files
committed
Preparing for merge to main
1 parent 06be0f3 commit b3c91ed

9 files changed

Lines changed: 56 additions & 51 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ FetchContent_Declare(xoshiro
2525
FetchContent_MakeAvailable(Catch2 xoshiro)
2626
# Include Xoshiro since it doesn't have a CMakeLists.txt
2727
include_directories(${xoshiro_SOURCE_DIR})
28-
# HomeBew Boost on macOS
29-
#find_package(Boost 1.83 REQUIRED CONFIG HINTS /opt/homebrew/Cellar/boost/1.83.0/lib/cmake)
30-
#if (Boost_FOUND)
31-
# message("-- Boost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}")
32-
# include_directories(${Boost_INCLUDE_DIRS})
33-
#endif()
3428
#===============================================================================
3529
# Flags
3630
#===============================================================================
@@ -53,7 +47,10 @@ project(sac-format
5347
LANGUAGES CXX
5448
DESCRIPTION "C++20 Single-Header SAC File library"
5549
HOMEPAGE_URL https://arbCoding.github.io/sac-format
56-
VERSION 0.9.0)
50+
VERSION 0.2.0)
51+
52+
include_directories(${sac-format_SOURCE_DIR}/src)
53+
5754
# Use C++20
5855
set(CMAKE_CXX_STANDARD 20)
5956
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -65,14 +62,15 @@ add_library(sac-format STATIC
6562

6663
set_target_properties(sac-format PROPERTIES VERSION ${PROJECT_VERSION})
6764
set_target_properties(sac-format PROPERTIES PUBLIC_HEADER src/sac_format.hpp)
65+
6866
#===============================================================================
6967
# Example programs
7068
#===============================================================================
71-
add_executable(sac_list
69+
add_executable(list_sac
7270
src/sac_format.hpp
73-
src/sac_list.cpp)
71+
src/examples/list_sac.cpp)
7472

75-
target_link_libraries(sac_list
73+
target_link_libraries(list_sac
7674
sac-format)
7775
#===============================================================================
7876
# Unit tests

docs/index.html

Lines changed: 28 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/sac-format_manual.pdf

46 Bytes
Binary file not shown.

src/docs/index.org

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ See the [[Benchmarking][Benchmarking]] section for more information.
3434
*** Easy
3535

3636
sac-format is *easy*---single-header makes integration in any project simple.
37-
[[https://cmake.org/][CMake]] makes building on different platforms a breeze. Object-oriented design
38-
makes use easy and intuitive. See the [[Quickstart][Quickstart]] section to get up and running.
37+
Building is a breeze with [[https://cmake.org/][CMake]], even on different platforms. Object-oriented
38+
design makes use easy and intuitive. See the [[Quickstart][Quickstart]] section to get up and
39+
running.
3940

4041
*** Small
4142

@@ -95,9 +96,9 @@ To use link to the compiled library (=libsac-format.a= on Linux/macOS,
9596

9697
** Example Programs
9798

98-
*** =sac_list=
99+
*** =list_sac=
99100

100-
=sac_list= is a command line program that takes a single SAC-file as its input
101+
=list_sac= is a command line program that takes a single SAC-file as its input
101102
argument. It reads the SAC-file and outputs the header/footer information, as
102103
well as the true size of the [[=data1=][=data1=]] and [[=data2=][=data2=]] vectors.
103104

@@ -190,12 +191,15 @@ int main() {
190191

191192
** Source File List
192193

193-
*** =sac_format.hpp=
194-
*** =sac_format.cpp=
195-
*** =util.hpp=
196-
*** =utests.cpp=
197-
*** =benchmark.cpp=
198-
*** =sac_list.cpp=
194+
*** Core
195+
**** =sac_format.hpp=
196+
**** =sac_format.cpp=
197+
*** Testing and Benchmarking
198+
**** =util.hpp=
199+
**** =utests.cpp=
200+
**** =benchmark.cpp=
201+
*** Example programs
202+
**** =list_sac.cpp=
199203

200204

201205
** Dependencies

src/docs/misc/settings.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
\vspace{4\baselineskip}
5252
{\Huge User Manual}\\
5353
\vspace{4\baselineskip}
54-
{\Large Version: 0.9.0}\\
54+
{\Large Version: 0.2.0}\\
5555
\vspace{10\baselineskip}
5656
{\Large\textsc{Alexander R. Blanchette}\par}
5757
\vspace{10\baselineskip}

src/sac_format.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
#include <string>
1818
#include <unordered_map>
1919
#include <vector>
20-
/* Boost string algorithms */
21-
// No longer using, keeping here in-case want to re-add in future
22-
//#include <boost/algorithm/string.hpp>
2320

2421
namespace sacfmt {
2522
//--------------------------------------------------------------------------

todo.org

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ Short and succinct
5959
**** DONE Dependencies
6060
*** DONE PDF :pdf:
6161
This involves setting up the export settings for the website for LaTeX.
62+
** TODO Example programs
63+
*** DONE list_sac
64+
*** TODO convert_sac
65+
Take a sacfile and an input flag for version (6/7), write out as updated version.
66+
*** TODO inspect_sac
6267
** DONE Namespace sacfmt
6368
** DONE Make single-header!
6469
* Inbox

uml/SacStream.png

-3.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)