HPCC-25192 Changes to allow ninja to build the system

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

CMakeLists.txt

@@ -515,7 +515,7 @@ add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
 add_custom_target(localinstall
-	COMMAND $(MAKE) install
+    COMMAND ${CMAKE_MAKE_PROGRAM} install
     )
 
 include(CPack)

esp/services/ws_sql/antlr3c.cmake

@@ -46,6 +46,7 @@ ExternalProject_Add(
     CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/antlr3c/src/libantlr3c/configure ${ANTLRcCONFIGURE_COMMAND_PARAMS} --prefix=${CMAKE_CURRENT_BINARY_DIR}/antlr3c 2> antlr.cfg.err
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/antlr3c
     BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+    BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/antlr3c/lib/${ANTLR3c_lib}
     BUILD_IN_SOURCE 1
     )
 

system/aws/CMakeLists.txt

@@ -13,8 +13,11 @@ if(USE_AWS)
         aws-sdk-cpp
         SOURCE_DIR ${AWS_SDK_CPP_SOURCE_DIR}
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp
-        CMAKE_ARGS -DCUSTOM_MEMORY_MANAGEMENT:string=0 -DCMAKE_CXX_FLAGS=${EXTERNAL_SQS_CXX_FLAGS}
-        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} LDFLAGS=-Wl,-rpath-link,${LIB_PATH} aws-cpp-sdk-sqs aws-cpp-sdk-s3
+        CMAKE_ARGS -DCUSTOM_MEMORY_MANAGEMENT:string=0 -DCMAKE_CXX_FLAGS=${EXTERNAL_SQS_CXX_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,-rpath-link,${LIB_PATH}
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} aws-cpp-sdk-sqs aws-cpp-sdk-s3
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp/aws-cpp-sdk-core/libaws-cpp-sdk-core${CMAKE_SHARED_LIBRARY_SUFFIX}
+                         ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp/aws-cpp-sdk-sqs/libaws-cpp-sdk-sqs${CMAKE_SHARED_LIBRARY_SUFFIX}
+                         ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp/aws-cpp-sdk-s3/libaws-cpp-sdk-s3${CMAKE_SHARED_LIBRARY_SUFFIX}
         INSTALL_COMMAND "")
 
     include(GNUInstallDirs)

system/azure/CMakeLists.txt

@@ -32,8 +32,9 @@ if(USE_AZURE)
         azure-storage-cpplite
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/azure-storage-cpplite
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/azure-storage-cpplite
-        CMAKE_ARGS -DCMAKE_CXX_FLAGS=${EXTERNAL_AZURE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DBUILD_SHARED_LIBS=ON
-        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} LDFLAGS=-Wl,-rpath-link,${LIB_PATH} azure-storage-lite
+        CMAKE_ARGS -DCMAKE_CXX_FLAGS=${EXTERNAL_AZURE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,-rpath-link,${LIB_PATH}
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} azure-storage-lite
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/azure-storage-cpplite/libazure-storage-lite${CMAKE_SHARED_LIBRARY_SUFFIX}
         INSTALL_COMMAND "")
 
     add_library(azure-storage-lite SHARED IMPORTED GLOBAL)