Tests did not compile

src/CMakeLists.txt

@@ -23,8 +23,9 @@ target_link_libraries (sfizz_parser PRIVATE absl::strings)
 add_library(sfizz STATIC)
 target_sources(sfizz PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp)
 target_include_directories (sfizz PUBLIC .)
-target_include_directories (sfizz PRIVATE external)
+target_include_directories (sfizz PUBLIC external)
-target_link_libraries (sfizz PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads)
+target_link_libraries (sfizz PUBLIC absl::strings absl::span)
+target_link_libraries (sfizz PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads)
 sfizz_link_libsndfile(sfizz)
 sfizz_enable_lto_if_needed(sfizz)
 

tests/ADSREnvelopeT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "ADSREnvelope.h"
+#include "sfizz/ADSREnvelope.h"
 #include "catch2/catch.hpp"
 #include <absl/algorithm/container.h>
 #include <absl/types/span.h>

tests/AudioBufferT.cpp

@@ -21,8 +21,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "AudioBuffer.h"
+#include "sfizz/AudioBuffer.h"
-#include "AudioSpan.h"
+#include "sfizz/AudioSpan.h"
 #include "catch2/catch.hpp"
 #include <algorithm>
 using namespace Catch::literals;

tests/BufferT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Buffer.h"
+#include "sfizz/Buffer.h"
 #include "catch2/catch.hpp"
 #include <algorithm>
 using namespace Catch::literals;

tests/CMakeLists.txt

@@ -32,11 +32,8 @@ target_link_libraries(cnpy PUBLIC ZLIB::ZLIB)
 target_include_directories(cnpy PUBLIC cnpy)
 
 add_executable(sfizz_tests ${SFIZZ_TEST_SOURCES})
-target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz)
+target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz cnpy)
-sfizz_link_libsndfile(sfizz_tests)
 
-target_link_libraries(sfizz_tests PRIVATE absl::strings absl::str_format absl::flat_hash_map cnpy absl::span absl::algorithm)
+# target_link_libraries(sfizz_tests PRIVATE absl::strings absl::str_format absl::flat_hash_map cnpy absl::span absl::algorithm)
-target_include_directories(sfizz_tests SYSTEM PRIVATE sources)
-sfizz_enable_lto_if_needed(sfizz_tests)
 
 file(COPY "." DESTINATION ${CMAKE_BINARY_DIR}/tests)

tests/EGDescriptionT.cpp

@@ -22,7 +22,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#include "EGDescription.h"
+#include "sfizz/EGDescription.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/EventEnvelopesT.cpp

@@ -21,9 +21,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "EventEnvelopes.h"
+#include "sfizz/EventEnvelopes.h"
-#include "SfzHelpers.h"
+#include "sfizz/SfzHelpers.h"
-#include "Buffer.h"
+#include "sfizz/Buffer.h"
 #include "catch2/catch.hpp"
 #include <absl/algorithm/container.h>
 #include <absl/types/span.h>

tests/FilesT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Synth.h"
+#include "sfizz/Synth.h"
 #include "catch2/catch.hpp"
 #include "ghc/fs_std.hpp"
 using namespace Catch::literals;

tests/HelpersT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "StringViewHelpers.h"
+#include "sfizz/StringViewHelpers.h"
 #include "catch2/catch.hpp"
 #include "absl/strings/string_view.h"
 using namespace Catch::literals;

tests/MidiStateT.cpp

@@ -27,7 +27,7 @@
  * and SynthT.cpp.
  */
 
-#include "MidiState.h"
+#include "sfizz/MidiState.h"
 #include "catch2/catch.hpp"
 #include "absl/strings/string_view.h"
 using namespace Catch::literals;

tests/OnePoleFilterT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "OnePoleFilter.h"
+#include "sfizz/OnePoleFilter.h"
 #include "catch2/catch.hpp"
 #include "cnpy.h"
 #include "ghc/fs_std.hpp"

tests/OpcodeT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Region.h"
+#include "sfizz/Region.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/ParsingT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "SfzHelpers.h"
+#include "sfizz/SfzHelpers.h"
 #include <iostream>
 #include "catch2/catch.hpp"
 using namespace Catch::literals;

tests/RangeT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Range.h"
+#include "sfizz/Range.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/RegionActivationT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Region.h"
+#include "sfizz/Region.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/RegionT.cpp

@@ -21,8 +21,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "MidiState.h"
+#include "sfizz/MidiState.h"
-#include "Region.h"
+#include "sfizz/Region.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/RegionTriggersT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Region.h"
+#include "sfizz/Region.h"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;
 

tests/RegionValueComputationsT.cpp

@@ -21,13 +21,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Defaults.h"
+#include "sfizz/Defaults.h"
-#include "Region.h"
+#include "sfizz/Region.h"
+#include "sfizz/SfzHelpers.h"
+#include "sfizz/MidiState.h"
 #include "catch2/catch.hpp"
-#include <SfzHelpers.h>
 #include <chrono>
 #include <thread>
-#include "MidiState.h"
 using namespace Catch::literals;
 constexpr int numRandomTests { 64 };
 TEST_CASE("[Region] Crossfade in on key")

tests/SIMDHelpersT.cpp

@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "SIMDHelpers.h"
+#include "sfizz/SIMDHelpers.h"
 #include "catch2/catch.hpp"
 #include <absl/algorithm/container.h>
 #include <absl/types/span.h>

tests/SynthT.cpp

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "Config.h"
 #include "sfizz.hpp"
 #include "catch2/catch.hpp"
 using namespace Catch::literals;