CMake changes to allow integrating the library as a CMake subproject.

Author: kblaschke

CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
 set(LANGUAGES C)
 if(BUILD_TESTING)
     set(CMAKE_CXX_STANDARD 14)
@@ -26,6 +24,8 @@ project(projectm-eval
         LANGUAGES ${LANGUAGES} # Using "enable_language(CXX)" in the test dir will NOT work properly!
         )
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
 include(GNUInstallDirs)
 include(FastMathOptimizations)
 include(CheckCSourceCompiles)

benchmarks/Stubs.cpp

@@ -1,6 +1,6 @@
 extern "C"
 {
-#include <MemoryBuffer.h>
+#include <projectm-eval/MemoryBuffer.h>
 }
 
 void projectm_eval_memory_host_lock_mutex(){}

projectm-eval/CMakeLists.txt

@@ -69,8 +69,8 @@ add_library(projectM_eval STATIC
 
 target_include_directories(projectM_eval
         PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/projectm-eval>
         )
 

tests/CMakeLists.txt

@@ -4,6 +4,8 @@ find_package(GTest 1.10 REQUIRED NO_MODULE)
 add_executable(projectM_EvalLib_Test
         InstructionListTest.cpp
         InstructionListTest.hpp
+        PrecedenceTest.cpp
+        PrecedenceTest.hpp
         Stubs.cpp
         TreeFunctionsTest.cpp
         )

tests/Stubs.cpp

@@ -1,6 +1,6 @@
 extern "C"
 {
-#include <MemoryBuffer.h>
+#include <projectm-eval/MemoryBuffer.h>
 }
 
 void projectm_eval_memory_host_lock_mutex(){}