From 9d3ca8795366c3f41d85df8100b2ff3d5a682729 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 14 Mar 2020 06:52:06 -0600 Subject: [PATCH] MSCG.cmake: fix build with ninja --- cmake/Modules/Packages/MSCG.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/Modules/Packages/MSCG.cmake b/cmake/Modules/Packages/MSCG.cmake index 99d98659ee..67db9ab251 100644 --- a/cmake/Modules/Packages/MSCG.cmake +++ b/cmake/Modules/Packages/MSCG.cmake @@ -8,9 +8,6 @@ if(PKG_MSCG) endif() option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" ${DOWNLOAD_MSCG_DEFAULT}) if(DOWNLOAD_MSCG) - if(CMAKE_GENERATOR STREQUAL "Ninja") - message(FATAL_ERROR "Cannot build downloaded MSCG library with Ninja build tool") - endif() include(ExternalProject) if(NOT LAPACK_FOUND) set(EXTRA_MSCG_OPTS "-DLAPACK_LIBRARIES=${CMAKE_CURRENT_BINARY_DIR}/liblinalg.a") @@ -21,6 +18,7 @@ if(PKG_MSCG) SOURCE_SUBDIR src/CMake CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS} BUILD_COMMAND make mscg INSTALL_COMMAND "" + BUILD_BYPRODUCTS /libmscg.a ) ExternalProject_get_property(mscg_build BINARY_DIR) set(MSCG_LIBRARIES ${BINARY_DIR}/libmscg.a)