Merge branch 'main' of https://github.com/geode-sdk/geode into main

geode-sdk · Aug 2, 2023 · b2d6771 · b2d6771
2 parents 0a6d31e + 25d9ab0
commit b2d6771
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,8 @@ jobs:
           os: windows-latest
           id: win
           extra_flags: >
-            -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
+            -DCMAKE_C_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe
+            -DCMAKE_CXX_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe
             -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On
           cli_cmd: ''
           package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi'
@@ -60,11 +61,6 @@ jobs:
         arch: amd64_x86
       if: matrix.config.id == 'win'
 
-    - name: Install ninja
-      shell: bash
-      run: choco install ninja
-      if: matrix.config.id == 'win'
-
     - name: Download CLI
       uses: robinraju/release-downloader@v1.8
       with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,8 +109,12 @@ set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)
 include(CheckCXXCompilerFlag)
 check_cxx_compiler_flag(-Wno-everything SUPPORTS_W_NO_EVERYTHING)
 if (SUPPORTS_W_NO_EVERYTHING)
-	target_compile_options(capstone-static PRIVATE -Wno-everything)
-	target_compile_options(keystone PRIVATE -Wno-everything)
+	if (TARGET capstone-static)
+		target_compile_options(capstone-static PRIVATE -Wno-everything)
+	endif()
+	if (TARGET keystone)
+		target_compile_options(keystone PRIVATE -Wno-everything)
+	endif()
 endif()
 
 target_sources(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/entry.cpp)

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
@@ -181,9 +181,15 @@ if (NOT GEODE_BUILDING_DOCS)
 	include(CheckCXXCompilerFlag)
 	check_cxx_compiler_flag(-Wno-everything SUPPORTS_W_NO_EVERYTHING)
 	if (SUPPORTS_W_NO_EVERYTHING)
-		target_compile_options(md4c PRIVATE -Wno-everything)
-		target_compile_options(zlib PRIVATE -Wno-everything)
-		target_compile_options(zlibstatic PRIVATE -Wno-everything)
+		if (TARGET md4c)
+			target_compile_options(md4c PRIVATE -Wno-everything)
+		endif()
+		if (TARGET zlib)
+			target_compile_options(zlib PRIVATE -Wno-everything)
+		endif()
+		if (TARGET zlibstatic)
+			target_compile_options(zlibstatic PRIVATE -Wno-everything)
+		endif()
 	endif()
 
 	# Regex support