Fix ninja build (hyperledger-iroha#1040)

Signed-off-by: Kitsu <[email protected]>
vinaychaudharyofficial · Mar 30, 2018 · e0ac9a2 · e0ac9a2
1 parent 57a377b
commit e0ac9a2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,6 +51,12 @@ if (NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE Debug)
 endif()
 
+if(CMAKE_GENERATOR MATCHES "Make")
+  set(MAKE "$(MAKE)")
+else()
+  set(MAKE make)
+endif()
+
 if(PACKAGE_TGZ OR PACKAGE_ZIP OR PACKAGE_RPM OR PACKAGE_DEB)
   message(STATUS "Packaging enabled: forcing non-packaging options to OFF")
   set(BENCHMARKING OFF)

diff --git a/cmake/Modules/Finded25519.cmake b/cmake/Modules/Finded25519.cmake
@@ -20,6 +20,7 @@ if (NOT ed25519_FOUND)
       GIT_REPOSITORY ${URL}
       GIT_TAG        ${VERSION}
       CMAKE_ARGS     -DTESTING=OFF -DBUILD=STATIC
+      BUILD_BYPRODUCTS ${EP_PREFIX}/src/hyperledger_ed25519-build/libed25519.a
       INSTALL_COMMAND "" # remove install step
       TEST_COMMAND    "" # remove test step
       UPDATE_COMMAND  "" # remove update step

diff --git a/cmake/Modules/Findpq.cmake b/cmake/Modules/Findpq.cmake
@@ -32,7 +32,7 @@ if (NOT pq_FOUND)
       GIT_TAG         ${VERSION}
       CONFIGURE_COMMAND ./configure --without-readline
       BUILD_IN_SOURCE 1
-      BUILD_COMMAND $(MAKE) -C ./src/bin/pg_config && $(MAKE) -C ./src/interfaces/libpq
+      BUILD_COMMAND ${MAKE} -C ./src/bin/pg_config && ${MAKE} -C ./src/interfaces/libpq
       BUILD_BYPRODUCTS ${EP_PREFIX}/src/postgres_postgres/src/interfaces/libpq/libpq.a
       INSTALL_COMMAND "" # remove install step
       TEST_COMMAND "" # remove test step

diff --git a/cmake/Modules/Findpqxx.cmake b/cmake/Modules/Findpqxx.cmake
@@ -21,7 +21,7 @@ if (NOT pqxx_FOUND)
       GIT_TAG        ${VERSION}
       CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CXXFLAGS=${CMAKE_CXX_FLAGS} CPPFLAGS=-I${postgres_INCLUDE_DIR} PG_CONFIG=${pg_config_EXECUTABLE} ./configure --disable-documentation --with-postgres-include=${pq_INCLUDE_DIR} --with-postgres-lib=${pq_INCLUDE_DIR}
       BUILD_IN_SOURCE 1
-      BUILD_COMMAND $(MAKE)
+      BUILD_COMMAND ${MAKE}
       BUILD_BYPRODUCTS ${EP_PREFIX}/src/jtv_libpqxx/src/.libs/libpqxx.a
                        ${EP_PREFIX}/src/jtv_libpqxx/src/libpqxx.la
                        ${EP_PREFIX}/src/jtv_libpqxx/src/.libs/libpqxx.la

diff --git a/cmake/Modules/Findswig.cmake b/cmake/Modules/Findswig.cmake
@@ -21,7 +21,7 @@ if(NOT SWIG_EXECUTABLE)
       # We should install SWIG to properly access SWIG lib
       CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --without-pcre --prefix=${EP_PREFIX}/src/swig_swig
       BUILD_IN_SOURCE ON
-      BUILD_COMMAND $(MAKE) swig
+      BUILD_COMMAND ${MAKE} swig
       TEST_COMMAND "" # remove test step
       )
   ExternalProject_Get_Property(swig_swig source_dir)

diff --git a/cmake/Modules/Findtbb.cmake b/cmake/Modules/Findtbb.cmake
@@ -22,7 +22,7 @@ if (NOT tbb_FOUND)
       GIT_REPOSITORY ${URL}
       GIT_TAG        ${VERSION}
       BUILD_IN_SOURCE 1
-      BUILD_COMMAND $(MAKE) tbb_build_prefix=build
+      BUILD_COMMAND ${MAKE} tbb_build_prefix=build
       BUILD_BYPRODUCTS ${EP_PREFIX}/src/01org_tbb/build/build_debug/${CMAKE_SHARED_LIBRARY_PREFIX}tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX}
                        ${EP_PREFIX}/src/01org_tbb/build/build_release/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}
       CONFIGURE_COMMAND "" # remove configure step