Skip to content

Commit d4d70b2

Browse files
make MAKE_PROGRAM assignment cross-generator-safe
1 parent bd19723 commit d4d70b2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

libs/EXTERNAL/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,13 @@ if (${WITH_PARMYS})
4747
SET(YOSYS_BUILD_DIR ${CMAKE_BINARY_DIR}/bin/yosys)
4848

4949
add_definitions("-D_YOSYS_")
50-
set(MAKE_PROGRAM "$$MAKE")
51-
set(CURRENT_CPPFLAGS "$(CPPFLAGS)-w")
50+
if(${CMAKE_GENERATOR} STREQUAL "Ninja")
51+
set(MAKE_PROGRAM "make")
52+
else()
53+
set(MAKE_PROGRAM "$$MAKE") # Escaped for Ninja
54+
endif()
55+
56+
set(CURRENT_CPPFLAGS "$(CPPFLAGS)-w")
5257
if(${CMAKE_GENERATOR} STREQUAL "Ninja")
5358
set(CURRENT_CPPFLAGS "-w")
5459
endif()

0 commit comments

Comments
 (0)