Fix recursive_library after rXXXXXX.

f4e34ac010d78d384ad18819db18ffa2e20967b9

build/export_generators/hardcoded-cmake/build/scripts/create_recursive_library_for_cmake.py

@@ -16,7 +16,7 @@ import tempfile
 class Opts(object):
     def __init__(self, args):
         argparser = argparse.ArgumentParser(allow_abbrev=False)
-        argparser.add_argument('--cmake-binary-dir', required=True)
+        argparser.add_argument('--project-binary-dir', required=True)
         argparser.add_argument('--cmake-ar', required=True)
         argparser.add_argument('--cmake-ranlib', required=True)
         argparser.add_argument('--cmake-host-system-name', required=True)

build/export_generators/hardcoded-cmake/cmake/recursive_library.cmake

@@ -30,7 +30,7 @@ function(add_recursive_library Target)
   endif()
   string(CONCAT CXX_LINKER_LAUNCHER_CMD "${Python3_EXECUTABLE}"
     ";${PROJECT_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py"
-    ";--cmake-binary-dir;${PROJECT_BINARY_DIR}"
+    ";--project-binary-dir;${PROJECT_BINARY_DIR}"
     ";--cmake-ar;${CMAKE_AR}"
     ";--cmake-ranlib;${CMAKE_RANLIB}"
     ";--cmake-host-system-name;${CMAKE_HOST_SYSTEM_NAME}"

build/scripts/create_recursive_library_for_cmake.py

@@ -16,7 +16,7 @@ import tempfile
 class Opts(object):
     def __init__(self, args):
         argparser = argparse.ArgumentParser(allow_abbrev=False)
-        argparser.add_argument('--cmake-binary-dir', required=True)
+        argparser.add_argument('--project-binary-dir', required=True)
         argparser.add_argument('--cmake-ar', required=True)
         argparser.add_argument('--cmake-ranlib', required=True)
         argparser.add_argument('--cmake-host-system-name', required=True)

cmake/recursive_library.cmake

@@ -30,7 +30,7 @@ function(add_recursive_library Target)
   endif()
   string(CONCAT CXX_LINKER_LAUNCHER_CMD "${Python3_EXECUTABLE}"
     ";${PROJECT_SOURCE_DIR}/build/scripts/create_recursive_library_for_cmake.py"
-    ";--cmake-binary-dir;${PROJECT_BINARY_DIR}"
+    ";--project-binary-dir;${PROJECT_BINARY_DIR}"
     ";--cmake-ar;${CMAKE_AR}"
     ";--cmake-ranlib;${CMAKE_RANLIB}"
     ";--cmake-host-system-name;${CMAKE_HOST_SYSTEM_NAME}"