Invoke cmake via CMAKE_COMMAND variable
authorDavid Neto <dneto@google.com>
Wed, 14 Feb 2018 23:27:22 +0000 (18:27 -0500)
committerDavid Neto <dneto@google.com>
Thu, 15 Feb 2018 16:34:50 +0000 (11:34 -0500)
Need to do this in case cmake is not on the path.
This should fix the Android NDK build, as in when building the NDK
itself.

CMakeLists.txt

index a2fc216..60c606d 100644 (file)
@@ -230,7 +230,8 @@ endif(SPIRV_BUILD_COMPRESSION)
 # Build pkg-config file
 # Use a first-class target so it's regenerated when relevant files are updated.
 add_custom_target(spirv-tools-pkg-config ALL
-        COMMAND cmake -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
+        COMMAND ${CMAKE_COMMAND}
+                      -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
                       -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in
                       -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
                       -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -240,7 +241,8 @@ add_custom_target(spirv-tools-pkg-config ALL
                       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
         DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake")
 add_custom_target(spirv-tools-shared-pkg-config ALL
-        COMMAND cmake -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
+        COMMAND ${CMAKE_COMMAND}
+                      -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
                       -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in
                       -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
                       -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}