generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allowed spaces in path to OpenCV (tested only Android build)

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-13 15:47:04 +00:00
parent 0b6fed32e3
commit 4d8a261d99
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCVPCHSupport.cmake
View File

@ -129,9 +129,9 @@ MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn )
# if you have different versions of the headers for different build types # if you have different versions of the headers for different build types
# you may set _pch_dowarn # you may set _pch_dowarn
IF (_dowarn) IF (_dowarn)
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} -Winvalid-pch " ) SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" -Winvalid-pch " )
ELSE (_dowarn) ELSE (_dowarn)
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include ${CMAKE_CURRENT_BINARY_DIR}/${_header_name} " ) SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" " )
ENDIF (_dowarn) ENDIF (_dowarn)
ELSE(CMAKE_COMPILER_IS_GNUCXX) ELSE(CMAKE_COMPILER_IS_GNUCXX)

6
modules/java/CMakeLists.txt
View File

@ -171,7 +171,11 @@ endforeach()
#android test project #android test project
if(ANDROID AND BUILD_TESTS AND CAN_BUILD_ANDROID_PROJECTS) if(ANDROID AND BUILD_TESTS AND CAN_BUILD_ANDROID_PROJECTS)
file(COPY android_test DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN ".svn" EXCLUDE) file(COPY android_test DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
PATTERN ".svn" EXCLUDE
PATTERN "gen" EXCLUDE
PATTERN "bin" EXCLUDE
)
SET(test_dir "${CMAKE_CURRENT_BINARY_DIR}/android_test") SET(test_dir "${CMAKE_CURRENT_BINARY_DIR}/android_test")
SET(test_name opencv_test_java) SET(test_name opencv_test_java)

6
samples/android/CMakeLists.txt
View File

@ -93,7 +93,11 @@ if (BUILD_ANDROID_EXAMPLES)
list(REMOVE_ITEM android_samples hello-android) list(REMOVE_ITEM android_samples hello-android)
list(SORT android_samples) list(SORT android_samples)
file(COPY ${android_samples} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN ".svn" EXCLUDE) file(COPY ${android_samples} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
PATTERN ".svn" EXCLUDE
PATTERN "gen" EXCLUDE
PATTERN "bin" EXCLUDE
)
foreach(sample ${android_samples}) foreach(sample ${android_samples})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${sample}/AndroidManifest.xml)