Prechádzať zdrojové kódy

Make it compile on linux again

Johannes Kreutz 3 rokov pred
rodič
commit
d02742263d

+ 5 - 5
trackpoint-app/CMakeLists.txt

@@ -6,11 +6,11 @@ INCLUDE(FetchContent)
 
 # Build TrackpointApp
 # Set C++ mode
-SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
 
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wunreachable-code")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wunreachable-code -Wno-register")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wno-register")
 
 SET(CMAKE_AUTOUIC ON)
 SET(CMAKE_AUTOMOC ON)
@@ -21,8 +21,8 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 ADD_COMPILE_DEFINITIONS(GL_SILENCE_DEPRECATION)
 
 # Qt
-LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/thirdparty/qt/install")
-FIND_PACKAGE(Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets REQUIRED NO_CMAKE_SYSTEM_PATH)
+#LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/thirdparty/qt/install")
+FIND_PACKAGE(Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets REQUIRED)
 
 # Json
 INCLUDE(thirdparty/json.cmake)

+ 1 - 0
trackpoint-app/src/OpenScadRenderer.cpp

@@ -7,6 +7,7 @@
 // Include dependencies
 #include <iostream>
 #include <fstream>
+#include <filesystem>
 
 const char* openScadBase =
   "$fn = 100;\n"