Browse Source

gtest: update to 1.17.0 (#7672)

* gtest: update to 1.17.0

* fixup

* Use `set_languages("%s")` once

* Update xmake.lua

* Just test shared build for windows os

---------

Co-authored-by: star9029 <[email protected]>
Saikari 1 month ago
parent
commit
9f939a599b
1 changed files with 33 additions and 11 deletions
  1. 33 11
      packages/g/gtest/xmake.lua

+ 33 - 11
packages/g/gtest/xmake.lua

@@ -5,6 +5,7 @@ package("gtest")
 
 
     add_urls("https://github.com/google/googletest/archive/refs/tags/$(version).zip", {alias = "archive"})
     add_urls("https://github.com/google/googletest/archive/refs/tags/$(version).zip", {alias = "archive"})
     add_urls("https://github.com/google/googletest.git", {alias = "github"})
     add_urls("https://github.com/google/googletest.git", {alias = "github"})
+
     add_versions("github:v1.8.1", "release-1.8.1")
     add_versions("github:v1.8.1", "release-1.8.1")
     add_versions("archive:v1.8.1", "927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7")
     add_versions("archive:v1.8.1", "927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7")
     add_versions("github:v1.10.0", "release-1.10.0")
     add_versions("github:v1.10.0", "release-1.10.0")
@@ -15,10 +16,12 @@ package("gtest")
     add_versions("archive:v1.12.0", "ce7366fe57eb49928311189cb0e40e0a8bf3d3682fca89af30d884c25e983786")
     add_versions("archive:v1.12.0", "ce7366fe57eb49928311189cb0e40e0a8bf3d3682fca89af30d884c25e983786")
     add_versions("github:v1.12.1", "release-1.12.1")
     add_versions("github:v1.12.1", "release-1.12.1")
     add_versions("archive:v1.12.1", "24564e3b712d3eb30ac9a85d92f7d720f60cc0173730ac166f27dda7fed76cb2")
     add_versions("archive:v1.12.1", "24564e3b712d3eb30ac9a85d92f7d720f60cc0173730ac166f27dda7fed76cb2")
+
     add_versions("v1.13.0", "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632")
     add_versions("v1.13.0", "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632")
     add_versions("v1.14.0", "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4")
     add_versions("v1.14.0", "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4")
     add_versions("v1.15.2", "f179ec217f9b3b3f3c6e8b02d3e7eda997b49e4ce26d6b235c9053bec9c0bf9f")
     add_versions("v1.15.2", "f179ec217f9b3b3f3c6e8b02d3e7eda997b49e4ce26d6b235c9053bec9c0bf9f")
     add_versions("v1.16.0", "a9607c9215866bd425a725610c5e0f739eeb50887a57903df48891446ce6fb3c")
     add_versions("v1.16.0", "a9607c9215866bd425a725610c5e0f739eeb50887a57903df48891446ce6fb3c")
+    add_versions("v1.17.0", "40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff")
 
 
     add_configs("main",  {description = "Link to the gtest_main entry point.", default = false, type = "boolean"})
     add_configs("main",  {description = "Link to the gtest_main entry point.", default = false, type = "boolean"})
     add_configs("gmock", {description = "Link to the googlemock library.", default = true, type = "boolean"})
     add_configs("gmock", {description = "Link to the googlemock library.", default = true, type = "boolean"})
@@ -27,35 +30,54 @@ package("gtest")
         add_syslinks("pthread")
         add_syslinks("pthread")
     end
     end
 
 
+    on_load(function (package)
+        if package:config("shared") and package:is_plat("windows") then
+            package:add("defines", "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+        end
+    end)
+
     on_install(function (package)
     on_install(function (package)
-        io.writefile("xmake.lua", [[
+        local std = "cxx14"
+        if package:version() and package:version():gt("1.16.0") then
+            std = "cxx17"
+        end
+        io.writefile("xmake.lua", format([[
+            set_languages("%s")
             target("gtest")
             target("gtest")
-                set_kind("static")
-                set_languages("cxx14")
+                set_kind("$(kind)")
                 add_files("googletest/src/gtest-all.cc")
                 add_files("googletest/src/gtest-all.cc")
                 add_includedirs("googletest/include", "googletest")
                 add_includedirs("googletest/include", "googletest")
                 add_headerfiles("googletest/include/(**.h)")
                 add_headerfiles("googletest/include/(**.h)")
+                if is_kind("shared") and is_plat("windows") then
+                    add_defines("GTEST_CREATE_SHARED_LIBRARY=1")
+                end
 
 
             target("gtest_main")
             target("gtest_main")
-                set_kind("static")
-                set_languages("cxx14")
+                set_kind("$(kind)")
                 set_default(]] .. tostring(package:config("main")) .. [[)
                 set_default(]] .. tostring(package:config("main")) .. [[)
                 add_files("googletest/src/gtest_main.cc")
                 add_files("googletest/src/gtest_main.cc")
                 add_includedirs("googletest/include", "googletest")
                 add_includedirs("googletest/include", "googletest")
-                add_headerfiles("googletest/include/(**.h)")
+                add_deps("gtest")
 
 
             target("gmock")
             target("gmock")
-                set_kind("static")
-                set_languages("cxx14")
+                set_kind("$(kind)")
                 set_default(]] .. tostring(package:config("gmock")) .. [[)
                 set_default(]] .. tostring(package:config("gmock")) .. [[)
                 add_files("googlemock/src/gmock-all.cc")
                 add_files("googlemock/src/gmock-all.cc")
                 add_includedirs("googlemock/include", "googlemock", "googletest/include", "googletest")
                 add_includedirs("googlemock/include", "googlemock", "googletest/include", "googletest")
                 add_headerfiles("googlemock/include/(**.h)")
                 add_headerfiles("googlemock/include/(**.h)")
-        ]])
+                if is_kind("shared") and is_plat("windows") then
+                    add_defines("GTEST_CREATE_SHARED_LIBRARY=1")
+                end
+                add_deps("gtest")
+        ]], std))
         import("package.tools.xmake").install(package)
         import("package.tools.xmake").install(package)
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)
+        local std = "c++14"
+        if package:version() and package:version():gt("1.16.0") then
+            std = "c++17"
+        end
         assert(package:check_cxxsnippets({test = [[
         assert(package:check_cxxsnippets({test = [[
             int factorial(int number) { return number <= 1 ? number : factorial(number - 1) * number; }
             int factorial(int number) { return number <= 1 ? number : factorial(number - 1) * number; }
             TEST(FactorialTest, Zero) {
             TEST(FactorialTest, Zero) {
@@ -65,7 +87,7 @@ package("gtest")
               EXPECT_EQ(6, factorial(3));
               EXPECT_EQ(6, factorial(3));
               EXPECT_EQ(3628800, factorial(10));
               EXPECT_EQ(3628800, factorial(10));
             }
             }
-        ]]}, {configs = {languages = "c++14"}, includes = "gtest/gtest.h"}))
+        ]]}, {configs = {languages = std}, includes = "gtest/gtest.h"}))
 
 
         if package:config("gmock") then
         if package:config("gmock") then
             assert(package:check_cxxsnippets({test = [[
             assert(package:check_cxxsnippets({test = [[
@@ -97,6 +119,6 @@ package("gtest")
 
 
                     EXPECT_TRUE(b_obj.b_foo());
                     EXPECT_TRUE(b_obj.b_foo());
                 }
                 }
-            ]]}, {configs = {languages = "c++14"}, includes = {"gtest/gtest.h", "gmock/gmock.h"}}))
+            ]]}, {configs = {languages = std}, includes = {"gtest/gtest.h", "gmock/gmock.h"}}))
         end
         end
     end)
     end)