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

Placed the if in the wrong place.

Browse Source
This commit is contained in:
Ethan Rublee 2011-06-01 18:54:34 +00:00
parent 7e2221f38f
commit 6c437cce36
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/highgui/CMakeLists.txt
View File

@ -380,39 +380,38 @@ if(BUILD_TESTS)
add_executable(${the_target} ${test_srcs} ${test_hdrs}) add_executable(${the_target} ${test_srcs} ${test_hdrs})
endif(BUILD_TESTS) if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/test_precomp.hpp)
if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
if(${CMAKE_GENERATOR} MATCHES "Visual*")
set(${the_target}_pch "test/test_precomp.cpp")
endif()
add_native_precompiled_header(${the_target} ${pch_header})
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
add_precompiled_header(${the_target} ${pch_header})
endif()
endif()
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS) # Additional target properties
set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/test_precomp.hpp) set_target_properties(${the_target} PROPERTIES
if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*") DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
if(${CMAKE_GENERATOR} MATCHES "Visual*") RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}"
set(${the_target}_pch "test/test_precomp.cpp") )
endif()
add_native_precompiled_header(${the_target} ${pch_header})
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
add_precompiled_header(${the_target} ${pch_header})
endif()
endif()
# Additional target properties
set_target_properties(${the_target} PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}"
)
if(ENABLE_SOLUTION_FOLDERS) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "tests") set_target_properties(${the_target} PROPERTIES FOLDER "tests")
endif() endif()
add_dependencies(${the_target} ${test_deps}) add_dependencies(${the_target} ${test_deps})
# Add the required libraries for linking: # Add the required libraries for linking:
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${test_deps}) target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${test_deps})
enable_testing() enable_testing()
get_target_property(LOC ${the_target} LOCATION) get_target_property(LOC ${the_target} LOCATION)
add_test(${the_target} "${LOC}") add_test(${the_target} "${LOC}")
if(WIN32) if(WIN32)
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
endif() endif()
endif(BUILD_TESTS)