Merge remote-tracking branch 'origin/master' into pybind11

Author: arahlin

core/CMakeLists.txt

@@ -5,6 +5,13 @@ else(APPLE)
 	set(CORE_EXTRA_SRCS "")
 endif(APPLE)
 
+if(NOT DEFINED WITHOUT_SUPERTIMESTREAM)
+	set(WITHOUT_SUPERTIMESTREAM FALSE CACHE BOOL "Build G3SuperTimestream class")
+endif()
+if(NOT WITHOUT_SUPERTIMESTREAM)
+	set(CORE_EXTRA_SRCS ${CORE_EXTRA_SRCS} src/G3SuperTimestream.cxx)
+endif()
+
 add_spt3g_library(core SHARED
 	src/G3Logging.cxx src/G3PrintfLogger.cxx src/G3SyslogLogger.cxx
 	src/crc32.c src/G3Frame.cxx src/G3Data.cxx src/G3TimeStamp.cxx
@@ -40,6 +47,13 @@ if(FLAC_FOUND)
 	target_link_libraries(core PRIVATE FLAC::FLAC)
 endif()
 
+if(NOT WITHOUT_SUPERTIMESTREAM)
+	find_package(OpenMP QUIET)
+	if(OpenMP_FOUND)
+		target_link_libraries(core PRIVATE OpenMP::OpenMP_CXX)
+	endif()
+endif()
+
 # Link against Z library
 if(NOT DEFINED WITH_ZLIB)
 	set(WITH_ZLIB TRUE CACHE BOOL "Enable gzip fie compression")