瀏覽代碼

Script updates for googlebenchmark-1.5.0 on Linux aarch64 (ARM64) (#141)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 年之前
父節點
當前提交
09a197937c
共有 2 個文件被更改,包括 4 次插入53 次删除
  1. 2 53
      package-system/googlebenchmark/build_config.json
  2. 2 0
      package_build_list_host_linux-aarch64.json

+ 2 - 53
package-system/googlebenchmark/build_config.json

@@ -34,15 +34,6 @@
                "-DBENCHMARK_ENABLE_TESTING=OFF",
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\"",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "cmake_build_args":[
-               "-j"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-               
             ],
             "custom_additional_libraries":[
                "Shlwapi"
@@ -69,18 +60,6 @@
                "-DBENCHMARK_ENABLE_TESTING=OFF",
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\"",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "cmake_build_args":[
-               "-j"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          }
       },
@@ -105,19 +84,6 @@
                "-DBENCHMARK_ENABLE_TESTING=OFF",
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\"",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "cmake_build_args":[
-               "-j",
-               "8"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          },
          "iOS":{
@@ -159,15 +125,6 @@
                "Release",
                "-j",
                "8"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          }
       },
@@ -192,17 +149,9 @@
                "-DBENCHMARK_ENABLE_TESTING=OFF",
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\"",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "cmake_build_args":[
-               "-j"
-            ],
-            "cmake_compile_definitions":[
-               
-            ],
-            "cmake_link_options":[
-               
             ]
-         }
+         },
+	 "Linux-aarch64": "@Linux"
       }
    }
 }

+ 2 - 0
package_build_list_host_linux-aarch64.json

@@ -5,6 +5,7 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean",
+        "googlebenchmark-1.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean",
         "OpenEXR-3.1.3-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux-aarch64 --clean",
         "Lua-5.4.4-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux-aarch64 --clean",
         "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
@@ -13,6 +14,7 @@
     },
     "build_from_folder": {
         "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64",
+        "googlebenchmark-1.5.0-rev2-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64",
         "OpenEXR-3.1.3-rev4-linux-aarch64": "package-system/OpenEXR/temp/OpenEXR-linux-aarch64",
         "Lua-5.4.4-rev1-linux-aarch64": "package-system/Lua/temp/Lua-linux-aarch64",
         "png-1.6.37-rev2-linux-aarch64":  "package-system/libpng/temp/png-linux-aarch64",