Browse Source

fix ubuntu build

pull/47/head
Canming Huang 8 years ago
parent
commit
80c3d3f11b
  1. 5
      CMakeLists.txt
  2. 4
      Emgu.CV.Test/CMakeLists.txt
  3. 8
      cmake/modules/CSharpMacros.cmake

5
CMakeLists.txt

@ -132,6 +132,11 @@ IF(WIN32 AND NOT MINGW)
ENDIF()
SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/libs)
IF(NOT WIN32)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/libs)
ENDIF()
IF(ANDROID)
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/android/${ANDROID_ABI}")
ELSEIF(WIN32)

4
Emgu.CV.Test/CMakeLists.txt

@ -29,7 +29,9 @@ IF (NOT EMGU_CV_WITH_TESSERACT)
ENDIF()
#copy the test data for this example
FILE(GLOB_RECURSE SRC_CV_TEST_DATA RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.jpg" "*.png" "*.gif" "*.data" "*.bmp" "*.xml" "*.avi")
#FILE(GLOB_RECURSE SRC_CV_TEST_DATA RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.jpg" "*.png" "*.gif" "*.data" "*.bmp" "*.xml" "*.avi")
FILE(GLOB_RECURSE SRC_CV_TEST_DATA "*.jpg" "*.png" "*.gif" "*.data" "*.bmp" "*.xml" "*.avi")
#MESSAGE(STATUS "SRC_CV_TEST_DATA: ${SRC_CV_TEST_DATA}")
LIST(APPEND
SRC_CV_TEST_DATA
${CMAKE_CURRENT_SOURCE_DIR}/../opencv/data/haarcascades/haarcascade_frontalface_alt2.xml

8
cmake/modules/CSharpMacros.cmake

@ -25,17 +25,17 @@
MACRO(GET_CS_LIBRARY_TARGET_DIR)
IF (NOT LIBRARY_OUTPUT_PATH)
SET(CS_LIBRARY_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
ELSE (NOT LIBRARY_OUTPUT_PATH)
ELSE ()
SET(CS_LIBRARY_TARGET_DIR ${LIBRARY_OUTPUT_PATH})
ENDIF (NOT LIBRARY_OUTPUT_PATH)
ENDIF ()
ENDMACRO(GET_CS_LIBRARY_TARGET_DIR)
MACRO(GET_CS_EXECUTABLE_TARGET_DIR)
IF (NOT EXECUTABLE_OUTPUT_PATH)
SET(CS_EXECUTABLE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
ELSE (NOT EXECUTABLE_OUTPUT_PATH)
ELSE ()
SET(CS_EXECUTABLE_TARGET_DIR ${EXECUTABLE_OUTPUT_PATH})
ENDIF (NOT EXECUTABLE_OUTPUT_PATH)
ENDIF ()
ENDMACRO(GET_CS_EXECUTABLE_TARGET_DIR)
MACRO(MAKE_PROPER_FILE_LIST source)

Loading…
Cancel
Save