Make a few fixes to release branch

yamadapc · Feb 8, 2024 · cf94cf7 · cf94cf7
1 parent 44c02aa
commit cf94cf7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,4 @@ cmake-build-debug-with-coverage
 FileSaver/FileSaver.xcodeproj/project.xcworkspace/xcuserdata
 filesaver_test.log
 /cmake-build-debug-with-coverage
+/.vscode
diff --git a/FileSaver/FileSaver/objcpp/controllers/file_table/DirectoryTableViewController.mm b/FileSaver/FileSaver/objcpp/controllers/file_table/DirectoryTableViewController.mm
@@ -11,6 +11,8 @@
 
 #include "../../../services/WorkerManagerService.h"
 #include "FileSaver.h"
+#include "utils/Utils.h"
+
 
 @implementation DirectoryTableViewController {
     NSTimer* timer;

diff --git a/...deproj/project.xcworkspace/xcuserdata/yamadapc.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/yamadapc.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FileSaver/conan.prof b/FileSaver/conan.prof
@@ -4,7 +4,7 @@ os_build=Macos
 arch=armv8
 arch_build=armv8
 compiler=apple-clang
-compiler.version=14.0
+compiler.version=15.0
 compiler.libcxx=libc++
 compiler.cppstd=17
 build_type=Release

diff --git a/FileSaver/conan_x86.prof b/FileSaver/conan_x86.prof
@@ -4,7 +4,7 @@ os_build=Macos
 arch=x86_64
 arch_build=x86_64
 compiler=apple-clang
-compiler.version=14.0
+compiler.version=15.0
 compiler.libcxx=libc++
 compiler.cppstd=17
 build_type=Release

diff --git a/Makefile b/Makefile
@@ -5,7 +5,8 @@ debug-build-and-test: FORCE
 
 debug-build: FORCE
 	mkdir -p build/debug
-	cd build/debug && cmake -DENABLE_CPPCHECK=ON -DENABLE_CLANG_TIDY=ON ../..
+	# cd build/debug && cmake -DENABLE_CPPCHECK=ON -DENABLE_CLANG_TIDY=ON ../..
+	cd build/debug && cmake ../..
 	cd build/debug && make -j
 
 release-build-and-test: FORCE
@@ -28,7 +29,7 @@ fix-xcconfig: FORCE
 
 build-gui-release: FORCE
 	make FileSaver/fat_conan.xcconfig
-	cd FileSaver && xcodebuild -project ./FileSaver.xcodeproj -scheme FileSaver -configuration Release
+	cd FileSaver && xcodebuild -project ./Parallel\ Disk\ Scanner.xcodeproj -scheme FileSaver -configuration Release
 
 # Requires github-release https://github.com/github-release/github-release
 app-release: FORCE

diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake
@@ -22,7 +22,7 @@ set(CONAN_EXTRA_OPTIONS
 
 conan_cmake_run(
   ARCH
-  ${CONAN_ARCH}
+  "${CONAN_ARCH}"
   REQUIRES
   ${CONAN_REQUIRES}
   OPTIONS