Update paths to Ruby 3.3.0 on Windows

ruby-rice · Feb 17, 2024 · f31d3f5 · f31d3f5
1 parent 91bb12a
commit f31d3f5
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/sample/callbacks/CMakeLists.txt b/sample/callbacks/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (sample_callbacks SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(sample_callbacks PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(sample_callbacks "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(sample_callbacks "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()
diff --git a/sample/enum/CMakeLists.txt b/sample/enum/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (sample_enum SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(sample_enum PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(sample_enum "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(sample_enum "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()
diff --git a/sample/inheritance/CMakeLists.txt b/sample/inheritance/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (animals SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(animals PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(animals "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(animals "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()
diff --git a/sample/map/CMakeLists.txt b/sample/map/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (map SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(map PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(map "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(map "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -53,14 +53,15 @@ add_executable (unittest
 if (MSVC)
   target_compile_definitions(unittest PRIVATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(unittest PRIVATE /bigobj)
-  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(unittest "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.3.0")
+  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.3.0/x64-mswin64_140")
+  target_link_libraries(unittest "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 elseif (MINGW)
   target_compile_options(unittest PRIVATE -Wa,-mbig-obj)
-  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.2.0/include/ruby-3.2.0")
-  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.2.0/include/ruby-3.2.0/x64-mingw-ucrt")
-  target_link_libraries(unittest "C:/msys64/usr/local/ruby-3.2.0/lib/libx64-ucrt-ruby320.dll.a")
+  target_compile_options(unittest PRIVATE -ftemplate-backtrace-limit=0)
+  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.3.0/include/ruby-3.3.0")
+  target_include_directories(unittest PRIVATE "C:/msys64/usr/local/ruby-3.3.0/include/ruby-3.3.0/x64-mingw-ucrt")
+  target_link_libraries(unittest "C:/msys64/usr/local/ruby-3.3.0/lib/libx64-ucrt-ruby330.dll.a")
 else ()
   target_link_libraries(unittest "/usr/lib64/libruby.so")
 endif ()
diff --git a/test/ext/t1/CMakeLists.txt b/test/ext/t1/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (t1 SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(t1 PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(t1 "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(t1 "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()
diff --git a/test/ext/t2/CMakeLists.txt b/test/ext/t2/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (t2 SHARED
 if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   target_compile_options(t2 PRIVATE /bigobj)
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0")
-  include_directories ("C:/msys64/usr/local/ruby-3.2.1-vc/include/ruby-3.2.0/x64-mswin64_140")
-  target_link_libraries(t2 "C:/msys64/usr/local/ruby-3.2.1-vc/lib/x64-vcruntime140-ruby320.lib")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0")
+  include_directories ("C:/msys64/usr/local/ruby-3.3.0-vc/include/ruby-3.2.0/x64-mswin64_140")
+  target_link_libraries(t2 "C:/msys64/usr/local/ruby-3.3.0-vc/lib/x64-vcruntime140-ruby330.lib")
 endif ()