diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 222618c..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -cmake_minimum_required(VERSION 3.3) - -project(TowerOptoSifAndSpectral) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) -set(QT Core Network WebSockets SerialPort Widgets) -set(CMAKE_CXX_STANDARD 14) - -find_package(Qt5 REQUIRED ${QT}) - - -file(GLOB_RECURSE HDR_LIST "source/*.h") -file(GLOB_RECURSE SRC_LIST "source/*.cpp") - -include_directories("source") -include_directories("source/FS") -include_directories("source/Logger") -include_directories("source/ZZ_SDK") -include_directories("source/Settings") -include_directories("source/CaptureThread") -include_directories("source/LinearShutter") -include_directories("source/OSIF/include") -include_directories("source/Misc_Detector") -include_directories("source/Uploader") - -link_directories("source/OSIF/DLib") -link_directories("/home/pi/SeaBrease/lib") -add_executable( TowerOptoSifAndSpectral - main.cpp - ${HDR_LIST} - ${SRC_LIST} -) -IF (WIN32) -target_link_libraries(TowerOptoSifAndSpectral SeaBreeze) -ELSE () -target_link_libraries(TowerOptoSifAndSpectral seabreeze usb stdc++ m) -ENDIF () -qt5_use_modules(TowerOptoSifAndSpectral ${QT}) -set_target_properties(TowerOptoSifAndSpectral PROPERTIES AUTOMOC ON) - - diff --git a/othersoft/install.sh b/othersoft/install.sh index b449e46..da345d7 100644 --- a/othersoft/install.sh +++ b/othersoft/install.sh @@ -23,7 +23,8 @@ cd TemperatureControler cmake ../../TemperatureControler/project make -j4 cp ./TemperatureControler /home/pi/bin -cp ../TemperatureControler/temperature_controler_config.json /home/data/Setting +mkdir -p /home/data/Setting +cp ../../TemperatureControler/temperature_controler_config.json /home/data/Setting cd ../ mkdir console