Merge branch 'master' of https://gitlab.engr.illinois.edu/whuie2/awg-control

Cpp/CMakeLists.txt

@@ -11,23 +11,20 @@ endif()
 
 set(CMAKE_CXX_STANDARD 20)
 
-project ("main")
-
+# add libraries
 add_library(wfmLib "")
 add_library(AWGLib "")
 add_subdirectory(lib)
 include_directories(lib/driver_header)
 
-set(MAINHEADERS
-)
-set(MAINSOURCES
-    run.cpp
-)
-
-add_executable(main ${MAINHEADERS} ${MAINSOURCES})
-
+find_package(Eigen3 3.4 REQUIRED NO_MODULE)
 set(LIBS
     wfmLib
     AWGLib
+    Eigen3::Eigen
 )
-target_link_libraries(main ${LIBS})
\ No newline at end of file
+
+# main.exe
+project ("main")
+add_executable(main run.cpp)
+target_link_libraries(main ${LIBS})

Cpp/lib/CMakeLists.txt

@@ -4,12 +4,6 @@ target_sources(wfmLib
 	PUBLIC
 		waveform.h
 )
-add_library(driverLib STATIC IMPORTED)
-set_target_properties(driverLib PROPERTIES
-    IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/driver_header/spcm_win64_msvcpp.lib"
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/driver_header"
-)
-target_link_libraries(AWGLib PUBLIC driverLib)
 target_include_directories(wfmLib PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
 target_sources(AWGLib
@@ -18,5 +12,11 @@ target_sources(AWGLib
 	PUBLIC
 		AWG.h
 )
+add_library(driverLib STATIC IMPORTED)
+set_target_properties(driverLib PROPERTIES
+    IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/driver_header/spcm_win64_msvcpp.lib"
+    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/driver_header"
+)
+target_link_libraries(AWGLib PUBLIC driverLib)
 target_include_directories(AWGLib PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 

Cpp/lib/Waveform.cpp

@@ -2,5 +2,5 @@
 
 
 Waveform::Waveform() {
-	this->freqRes = 0;
+	
 }

Cpp/run.cpp

 #include <iostream>
 #include "lib/AWG.h"
 #include "lib/waveform.h"
-
+#include <Eigen/Dense>
 int main()
 {
 	auto wfm = Waveform::Waveform();