Browse Source

Revert commit rXXXXXX, External build system generator release 57

zhukoff-pavel 1 year ago
parent
commit
5d4b24e788
3 changed files with 15 additions and 15 deletions
  1. 6 6
      CMakeLists.txt
  2. 3 3
      build/external_resources/yexport/resources.json
  3. 6 6
      build/mapping.conf.json

+ 6 - 6
CMakeLists.txt

@@ -39,17 +39,17 @@ include(cmake/shared_libs.cmake)
 include(cmake/global_vars.cmake)
 
 if (CMAKE_CROSSCOMPILING)
-  include(${{CMAKE_BINARY_DIR}}/conan_paths.cmake)
+  include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
 else()
   conan_cmake_autodetect(settings)
   conan_cmake_install(
-    PATH_OR_REFERENCE ${{CMAKE_SOURCE_DIR}}
-    INSTALL_FOLDER ${{CMAKE_BINARY_DIR}}
+    PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR}
+    INSTALL_FOLDER ${CMAKE_BINARY_DIR}
     BUILD missing
     REMOTE conancenter
-    SETTINGS ${{settings}}
-      ENV "CONAN_CMAKE_GENERATOR=${{CMAKE_GENERATOR}}"
-      CONF "tools.cmake.cmaketoolchain:generator=${{CMAKE_GENERATOR}}"
+    SETTINGS ${settings}
+      ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}"
+      CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}"
   )
 endif()
 

+ 3 - 3
build/external_resources/yexport/resources.json

@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:5228928365"
+            "uri": "sbr:5111970858"
         },
         "darwin-arm64": {
-            "uri": "sbr:5228924637"
+            "uri": "sbr:5111976416"
         },
         "linux": {
-            "uri": "sbr:5228936169"
+            "uri": "sbr:5112005661"
         }
     }
 }

+ 6 - 6
build/mapping.conf.json

@@ -102,9 +102,9 @@
         "5054512910": "http://devtools-registry.s3.yandex.net/5054512910",
         "5054518131": "http://devtools-registry.s3.yandex.net/5054518131",
         "5054515588": "http://devtools-registry.s3.yandex.net/5054515588",
-        "5228939804": "http://devtools-registry.s3.yandex.net/5228939804",
-        "5228943140": "http://devtools-registry.s3.yandex.net/5228943140",
-        "5228927925": "http://devtools-registry.s3.yandex.net/5228927925",
+        "5111996178": "http://devtools-registry.s3.yandex.net/5111996178",
+        "5111987261": "http://devtools-registry.s3.yandex.net/5111987261",
+        "5111998098": "http://devtools-registry.s3.yandex.net/5111998098",
         "5171095103": "http://devtools-registry.s3.yandex.net/5171095103",
         "5171093801": "http://devtools-registry.s3.yandex.net/5171093801",
         "5171093016": "http://devtools-registry.s3.yandex.net/5171093016",
@@ -214,9 +214,9 @@
         "5054512910": "ya-tc for darwin-arm64",
         "5054518131": "ya-tc for linux",
         "5054515588": "ya-tc for linux-aarch64",
-        "5228939804": "yexport for darwin",
-        "5228943140": "yexport for darwin-arm64",
-        "5228927925": "yexport for linux",
+        "5111996178": "yexport for darwin",
+        "5111987261": "yexport for darwin-arm64",
+        "5111998098": "yexport for linux",
         "5171095103": "ymake for darwin",
         "5171093801": "ymake for darwin-arm64",
         "5171093016": "ymake for linux",