Clear compilation warnings (JingMatrix#121)

* Fix warnings of CMake To completely remove CMake version warnings, one may need to change the CMakeLists.txt file in the NDK installation. * Add compiler flag -Wpedantic Show compilation errors for the core subject, while ignore some of them
Dev4Mod · Dec 9, 2024 · e7a5835 · e7a5835
1 parent 8dff17c
commit e7a5835
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt
@@ -1,6 +1,8 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(core)
 
+set(CMAKE_CXX_STANDARD 23)
+
 add_subdirectory(${EXTERNAL_ROOT} external)
 
 aux_source_directory(src SRC_LIST)
@@ -9,8 +11,16 @@ aux_source_directory(src/xz SRC_LIST)
 
 add_library(${PROJECT_NAME} STATIC ${SRC_LIST})
 
+set(IGNORED_WARNINGS
+	-Wno-c99-extensions
+	-Wno-gnu-zero-variadic-macro-arguments
+	-Wno-gnu-flexible-array-initializer
+	-Wno-variadic-macros
+	-Wno-zero-length-array)
+
 target_include_directories(${PROJECT_NAME} PUBLIC include)
 target_include_directories(${PROJECT_NAME} PRIVATE src ${EXTERNAL_ROOT}/xz-embedded/linux/include)
+target_compile_options(${PROJECT_NAME} PRIVATE -Wpedantic ${IGNORED_WARNINGS})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC dobby_static lsplant_static xz_static log fmt-header-only)
 target_link_libraries(${PROJECT_NAME} PRIVATE dex_builder_static)
diff --git a/daemon/src/main/jni/CMakeLists.txt b/daemon/src/main/jni/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(daemon)
 
 add_subdirectory(${EXTERNAL_ROOT} external)

diff --git a/dex2oat/src/main/cpp/CMakeLists.txt b/dex2oat/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(dex2oat)
 
 add_executable(dex2oat dex2oat.c)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -109,6 +109,7 @@ set(XZ_SOURCES
 set(XZ_INCLUDES xz-embedded/linux/include/linux xz-embedded/userspace)
 list(TRANSFORM XZ_SOURCES PREPEND xz-embedded/linux/lib/xz/)
 add_library(xz_static STATIC ${XZ_SOURCES})
+target_compile_options(xz_static PRIVATE -DXZ_USE_CRC64)
 target_include_directories(xz_static PRIVATE ${XZ_INCLUDES})
 
 link_libraries(cxx)

diff --git a/external/dobby b/external/dobby
diff --git a/external/lsplant b/external/lsplant
diff --git a/magisk-loader/src/main/jni/CMakeLists.txt b/magisk-loader/src/main/jni/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 project(lspd)
 
 add_subdirectory(${CORE_ROOT} core)
+2 −2		CMakeLists.txt
+11 −56		source/Backend/UserMode/PlatformUtil/Linux/ProcessRuntimeUtility.cc
+8 −28		source/InstructionRelocation/arm/InstructionRelocationARM.cc
+1 −8		source/InstructionRelocation/arm/InstructionRelocationARM.h
+0 −1		source/InstructionRelocation/x86/InstructionRelocationX86.cc
+2 −2		source/InstructionRelocation/x86/x86_insn_decode/x86_insn_decode.c
+0 −22		source/InstructionRelocation/x86/x86_insn_decode/x86_insn_reader.c
+1 −1		source/InterceptRouting/InterceptRouting.cpp
+2 −2		source/InterceptRouting/RoutingPlugin/NearBranchTrampoline/NearBranchTrampoline.cc
+0 −3		source/InterceptRouting/RoutingPlugin/RoutingPlugin.h
+1 −5		source/core/arch/arm/registers-arm.h
+4 −8		source/core/arch/arm64/registers-arm64.h
+1 −1		source/core/arch/x64/registers-x64.h
+1 −1		source/core/arch/x86/registers-x86.h
+9 −12		source/core/assembler/assembler-arm.h
+10 −11		source/core/assembler/assembler-arm64.h
+2 −2		source/core/assembler/assembler-ia32.h
+1 −1		source/core/assembler/assembler-x64.h
+1 −1		.gitmodules
+1 −1		lsplant/src/main/jni/external/dex_builder