Merge remote-tracking branch 'origin/develop' into msvc_support

Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt

@@ -174,6 +174,6 @@ otb_add_test(NAME owTuDocExampleStructureNew COMMAND otbApplicationEngineTestDri
   )
 
 otb_add_test(NAME owTvApplicationMemoryConnectTest COMMAND otbApplicationEngineTestDriver otbApplicationMemoryConnectTest
-  ${CMAKE_BINARY_DIR}/lib/otb/applications
+  $<TARGET_FILE_DIR:otbapp_Smoothing>
   ${INPUTDATA}/poupees.tif
   ${TEMP}/owTvApplicationMemoryConnectTestOutput.tif)

Modules/Wrappers/SWIG/test/python/CMakeLists.txt

@@ -5,9 +5,9 @@ set(TEST_DRIVER otbTestDriver
 
 if(WIN32)
   # on windows, loading the module _otbApplication requires the otbossimplugins*.dll
-  # which is in the 'bin' folder
+  # which is in the 'bin/<CMAKE_BUILD_TYPE>' folder
   set(TEST_DRIVER ${TEST_DRIVER}
-    --add-before-env PATH ${OTB_BINARY_DIR}/bin)
+    --add-before-env PATH $<TARGET_FILE_DIR:OTBCommon>)
 endif(WIN32)
 
 add_test( NAME pyTvSmoothing