Browse Source

Windows build fix.

UWP10
Canming Huang 11 years ago
parent
commit
51e87cd81b
  1. 4
      Emgu.CV.UI.GL/CMakeLists.txt
  2. 4
      Emgu.CV.UI/CMakeLists.txt
  3. 15
      cmake/modules/CSharpMacros.cmake

4
Emgu.CV.UI.GL/CMakeLists.txt

@ -5,7 +5,7 @@
IF(EMGU_CV_BUILD)
PROJECT(Emgu.CV.UI.GL)
MESSAGE(STATUS "Configuring Emgu.CV.UI.GL")
FILE(GLOB_RECURSE SRC_CV_UI_GL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
LIST(APPEND SRC_CV_UI_GL ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)
@ -14,7 +14,7 @@ SIGN_ASSEMBLY(${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.snk)
SET_CS_TARGET_FRAMEWORK(${CSC_TARGET_FRAMEWORK})
ADD_CS_REFERENCES("${LIBRARY_OUTPUT_PATH}/Emgu.CV.dll;${LIBRARY_OUTPUT_PATH}/Emgu.Util.dll;${CMAKE_CURRENT_SOURCE_DIR}/OpenTK.Compatibility.dll;${CMAKE_CURRENT_SOURCE_DIR}/OpenTK.dll;${CMAKE_CURRENT_SOURCE_DIR}/OpenTK.GLControl.dll;")
#ADD_CS_FRAMEWORK_REFERENCES("${CSC_TARGET_FRAMEWORK}" "System.Data.dll;System.Windows.Forms.dll")
ADD_CS_FRAMEWORK_REFERENCES("${CSC_TARGET_FRAMEWORK}" "System.Windows.Forms.dll")
COMPILE_CS(${PROJECT_NAME} "library" "${SRC_CV_UI_GL}" ALL)
if(ENABLE_SOLUTION_FOLDERS)

4
Emgu.CV.UI/CMakeLists.txt

@ -5,7 +5,7 @@
IF((EMGU_CV_BUILD OR EMGU_CV_EXAMPLE_BUILD) AND NOT ANDROID AND NOT NETFX_CORE)
PROJECT(Emgu.CV.UI)
MESSAGE(STATUS "Configuring Emgu.CV.UI")
FILE(GLOB_RECURSE SRC_CV_UI RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
LIST(APPEND SRC_CV_UI ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)
@ -13,7 +13,7 @@ GENERATE_DOCUMENT(${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME})
SIGN_ASSEMBLY(${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.snk)
SET_CS_TARGET_FRAMEWORK(${CSC_TARGET_FRAMEWORK})
ADD_CS_REFERENCES("${LIBRARY_OUTPUT_PATH}/Emgu.Util.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.dll;${LIBRARY_3RDPARTY_PATH}/ZedGraph.dll")
#ADD_CS_FRAMEWORK_REFERENCES("${CSC_TARGET_FRAMEWORK}" "System.Data.dll;System.Windows.Forms.dll")
ADD_CS_FRAMEWORK_REFERENCES("${CSC_TARGET_FRAMEWORK}" "System.Windows.Forms.dll")
FILE(GLOB RESX_SRC
"${CMAKE_CURRENT_SOURCE_DIR}/*.resx"

15
cmake/modules/CSharpMacros.cmake

@ -98,7 +98,7 @@ MACRO(ADD_CS_REFERENCES references)
ENDMACRO(ADD_CS_REFERENCES)
MACRO(ADD_CS_FRAMEWORK_REFERENCES ver refs)
#MESSAGE("FRAMEWORK refs: ${refs}")
MESSAGE(STATUS "ADD_CS_FRAMEWORK_REFERENCES ver: ${ver}; refs: ${refs}")
SET(CSC_MSCORLIB_FOLDER "")
IF("${ver}" STREQUAL "3.5")
GET_FILENAME_COMPONENT(CSC_MSCORLIB_FOLDER ${CSC_MSCORLIB_35} DIRECTORY)
@ -106,22 +106,25 @@ MACRO(ADD_CS_FRAMEWORK_REFERENCES ver refs)
ENDIF()
FOREACH(ref ${refs})
#MESSAGE("Adding ${ref} from ${refs}")
#MESSAGE(STATUS "Adding ${ref} from ${refs}")
LIST(APPEND CS_FLAGS -r:\"${CSC_MSCORLIB_FOLDER}${ref}\")
ENDFOREACH()
ENDMACRO()
MACRO(SET_CS_TARGET_FRAMEWORK)
SET(EXTRA_MACRO_ARGS ${ARGN})
#MESSAGE(STATUS "SET_CS_TARGET_FRAMEWORK ${EXTRA_MACRO_ARGS}")
#did we get the version string?
list(LENGTH EXTRA_MACRO_ARGS NUM_EXTRA_ARGS)
#MESSAGE(STATUS "Extra parameters: ${NUM_EXTRA_ARGS}")
IF (${NUM_EXTRA_ARGS} GREATER 0)
LIST(GET ${EXTRA_MACRO_ARGS} 0 version)
#MESSAGE(STATUS "GREATER than 0")
LIST(GET EXTRA_MACRO_ARGS 0 version)
#MESSAGE(STATUS "VERSION: ${version}")
ELSE()
SET(version "")
ENDIF()
IF("${version}" STREQUAL "3.5")
LIST(APPEND CS_COMMANDLINE_FLAGS -noconfig )
LIST(APPEND CS_FLAGS -nostdlib)
@ -131,7 +134,7 @@ MACRO(SET_CS_TARGET_FRAMEWORK)
IF(NOT NETFX_CORE)
LIST(APPEND FRAMEWORK_REFERENCES System.Core.dll System.Xml.dll System.Drawing.dll System.Data.dll System.ServiceModel.dll System.Xml.Linq.dll)
ENDIF()
#MESSAGE("FRAMEWORK reference: ${FRAMEWORK_REFERENCES}")
#MESSAGE(STATUS "FRAMEWORK reference: ver: ${version}; ref: ${FRAMEWORK_REFERENCES}")
ADD_CS_FRAMEWORK_REFERENCES("${version}" "${FRAMEWORK_REFERENCES}")
ENDMACRO(SET_CS_TARGET_FRAMEWORK)

Loading…
Cancel
Save