Browse Source

Let cmake csharp macro handler spaces in file names

git-svn-id: https://emgucv.svn.sourceforge.net/svnroot/emgucv/trunk@764 d7f09016-e345-0410-b530-edf29a71df78
UWP10
canming 16 years ago
parent
commit
ed8eb617ce
  1. 2
      Emgu.CV.DebuggerVisualizers/CMakeLists.txt
  2. 12
      cmake/modules/CSharpMacros.cmake

2
Emgu.CV.DebuggerVisualizers/CMakeLists.txt

@ -15,7 +15,7 @@ PATHS
FILE(GLOB_RECURSE SRC_CV_DEBUGGER_VISUALIZER RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
SET(SRC_CV_DEBUGGER_VISUALIZER ${SRC_CV_DEBUGGER_VISUALIZER} ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)
SIGN_ASSEMBLY(${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.snk)
ADD_CS_REFERENCES("System.Drawing.dll;${LIBRARY_OUTPUT_PATH}/Emgu.Util.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.UI.dll;\"${DEBUGGER_VISUALIZER_LIB}\"")
ADD_CS_REFERENCES("System.Drawing.dll;${LIBRARY_OUTPUT_PATH}/Emgu.Util.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.UI.dll;${DEBUGGER_VISUALIZER_LIB}")
COMPILE_CS(${PROJECT_NAME} "library" "${SRC_CV_DEBUGGER_VISUALIZER}" ALL)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)

12
cmake/modules/CSharpMacros.cmake

@ -115,12 +115,12 @@ ENDIF(${target_type} STREQUAL "library")
COMMAND ${CMAKE_COMMAND} -E make_directory "${COMPILE_CS_TARGET_DIR}"
)
SET(TMP "-out:${target_name} -target:${target_type}")
SET(TMP "-out:\"${target_name}\" -target:${target_type}")
FOREACH(TMP_NAME ${CS_FLAGS})
SET(TMP "${TMP} ${TMP_NAME}")
ENDFOREACH()
FOREACH(TMP_NAME ${proper_file_list})
SET(TMP "${TMP} ${TMP_NAME}")
SET(TMP "${TMP} \"${TMP_NAME}\"")
ENDFOREACH()
FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/cscSourceList.rsp "${TMP}")
@ -140,7 +140,7 @@ ENDMACRO(COMPILE_CS)
MACRO(ADD_CS_REFERENCES references)
FOREACH(ref ${references})
SET(CS_FLAGS ${CS_FLAGS} -r:${ref})
SET(CS_FLAGS ${CS_FLAGS} -r:\"${ref}\")
ENDFOREACH(ref)
ENDMACRO(ADD_CS_REFERENCES references)
@ -155,15 +155,15 @@ MACRO(ADD_CS_RESOURCES resx resources)
${CS_PREBUILD_COMMAND}
COMMAND ${RESGEN_EXECUTABLE} ${resx} ${resources}
)
SET(CS_FLAGS ${CS_FLAGS} -resource:${resources})
SET(CS_FLAGS ${CS_FLAGS} -resource:\"${resources}\")
ENDMACRO(ADD_CS_RESOURCES)
MACRO(SIGN_ASSEMBLY key)
SET(CS_FLAGS ${CS_FLAGS} -keyfile:${key})
SET(CS_FLAGS ${CS_FLAGS} -keyfile:\"${key}\")
ENDMACRO(SIGN_ASSEMBLY)
MACRO(GENERATE_DOCUMENT file)
SET(CS_FLAGS ${CS_FLAGS} -doc:${file}.xml)
SET(CS_FLAGS ${CS_FLAGS} -doc:\"${file}.xml\")
ENDMACRO(GENERATE_DOCUMENT)
MACRO(INSTALL_GAC target)

Loading…
Cancel
Save