From 53124e97048f10f52fa7f62360b3ed2d5fb3e75f Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Tue, 13 Dec 2016 17:14:21 -0800 Subject: [PATCH] npm: rename c sources to avoid node-gyp makefile target collision Signed-off-by: Mihai Tudor Panu --- src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42007fe3..51571447 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -321,8 +321,12 @@ if (BUILDSWIGNODE) "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") foreach (srcfile ${srcfiles}) + get_filename_component(csource ${srcfile} NAME_WE) file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/${srcfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}) - if (${srcfile} MATCHES ".c" OR ${srcfile} MATCHES ".cxx" OR ${srcfile} MATCHES ".cpp") + if(${srcfile} MATCHES ".c$") + file (RENAME ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/${srcfile} ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/${csource}_c.c) + set (upm_LIB_SRCS_GYP "'${csource}_c.c',\n${upm_LIB_SRCS_GYP}") + elseif (${srcfile} MATCHES ".cxx$" OR ${srcfile} MATCHES ".cpp$") set (upm_LIB_SRCS_GYP "'${srcfile}',\n${upm_LIB_SRCS_GYP}") endif () endforeach ()