Try fix and add log

MihailRis · Jan 10, 2025 · 606a654 · 606a654
1 parent ce8e021
commit 606a654
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml
@@ -41,11 +41,12 @@ jobs:
             ./vcpkg integrate install
             cd ..
       - name: Configure project with CMake and vcpkg
+        env:
+            VCPKG_DEFAULT_TRIPLET: x64-mingw-static
+            VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static
+            VCPKG_ROOT: ${{ github.workspace }}/vcpkg
         shell: msys2 {0}
         run: |
-            export VCPKG_DEFAULT_TRIPLET=x64-mingw-static
-            export VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-static
-            export VCPKG_ROOT=./vcpkg
             mkdir build
             cd build
             cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ..

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,6 +26,9 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     find_package(vorbis REQUIRED)
     if(VCPKG_TARGET_TRIPLET MATCHES "static")
+        file(GLOB_RECURSE paths
+             $ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/*)
+        message(STATUS "Path to include jit: ${paths}")
         add_library(luajit STATIC IMPORTED)
         set_target_properties(
             luajit
@@ -37,6 +40,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         )
     else()
         add_library(luajit SHARED IMPORTED)
+        file(GLOB_RECURSE paths
+             $ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/*)
+        message(STATUS "Path to include jit: ${paths}")
         set_target_properties(
             luajit
             PROPERTIES

diff --git a/vctest/CMakeLists.txt b/vctest/CMakeLists.txt
@@ -5,22 +5,18 @@ add_executable(vctest ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
 # Needed for header-only source util/ArgsReader.hpp
 target_include_directories(vctest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
-if(MSVC)
-    target_compile_options(vctest PRIVATE /W4)
-else()
-    target_compile_options(
-        vctest
-        PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W4>
-                $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
-                -Wall
-                -Wextra
-                -Wformat-nonliteral
-                -Wcast-align
-                -Wpointer-arith
-                -Wundef
-                -Wwrite-strings
-                -Wno-unused-parameter
-                >)
-endif()
+target_compile_options(
+    vctest
+    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W4>
+            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
+            -Wall
+            -Wextra
+            -Wformat-nonliteral
+            -Wcast-align
+            -Wpointer-arith
+            -Wundef
+            -Wwrite-strings
+            -Wno-unused-parameter
+            >)
 
 target_link_options(vctest PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie -lstdc++fs>)