propagated some fixes from 2.3 to trunk

2011-06-23 12:00:09 +00:00
parent d4fbb2c4fb
commit 49467947ac
26 changed files with 378 additions and 318 deletions
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -234,7 +234,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
    get_target_property(LOC ${the_test_target} LOCATION)
    add_test(${the_test_target} "${LOC}")
    
-    if(WIN32)
-        install(TARGETS ${the_test_target} RUNTIME DESTINATION bin COMPONENT main)
-    endif()
+    #if(WIN32)
+    #    install(TARGETS ${the_test_target} RUNTIME DESTINATION bin COMPONENT main)
+    #endif()
 endif()