diff --git a/Cpp/CMakeLists.txt b/Cpp/CMakeLists.txt index 98229d057c798fa9c0f188febba7bc4ef508b47f..0f2c19a370bbcf64c3f8426a923866953edbb086 100644 --- a/Cpp/CMakeLists.txt +++ b/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}) diff --git a/Cpp/lib/CMakeLists.txt b/Cpp/lib/CMakeLists.txt index 28e506e71057cd04faf9ac059d67af5fc6b5affc..67b4031458bfad9ee27f4da85555377c8329c1db 100644 --- a/Cpp/lib/CMakeLists.txt +++ b/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}) diff --git a/Cpp/lib/Waveform.cpp b/Cpp/lib/Waveform.cpp index 2be97e0a951c307910f72b1f17897df82abfe766..c246c141f9c5c480816a54cb69c950e7eaf9c4ed 100644 --- a/Cpp/lib/Waveform.cpp +++ b/Cpp/lib/Waveform.cpp @@ -2,5 +2,5 @@ Waveform::Waveform() { - this->freqRes = 0; + } diff --git a/Cpp/run.cpp b/Cpp/run.cpp index 239c8bf81041a63d5433176143b052cc2c8d36ab..ae75247cdce6008ad50cc7cd7d7e95deb5131873 100644 --- a/Cpp/run.cpp +++ b/Cpp/run.cpp @@ -1,7 +1,7 @@ #include <iostream> #include "lib/AWG.h" #include "lib/waveform.h" - +#include <Eigen/Dense> int main() { auto wfm = Waveform::Waveform();