Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was found."
This reverts commit f3de459cec
.
There are some platforms without MSVC where this test doesn't work well. We can look
into these later.
This commit is contained in:
parent
e17135e882
commit
41f962a2cb
|
@ -195,9 +195,7 @@ IF(BUILD_TESTING)
|
||||||
|
|
||||||
|
|
||||||
# run test for BundleUtilities on supported platforms/compilers
|
# run test for BundleUtilities on supported platforms/compilers
|
||||||
find_program(DUMPBIN_EXECUTABLE NAMES dumpbin)
|
if(MSVC OR
|
||||||
mark_as_advanced(DUMPBIN_EXECUTABLE)
|
|
||||||
if(MSVC OR DUMPBIN_EXECUTABLE OR
|
|
||||||
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||||
CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||||
ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND}
|
ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND}
|
||||||
|
@ -209,7 +207,7 @@ IF(BUILD_TESTING)
|
||||||
--build-project BundleUtilities
|
--build-project BundleUtilities
|
||||||
)
|
)
|
||||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
|
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
|
||||||
endif(MSVC OR DUMPBIN_EXECUTABLE OR
|
endif(MSVC OR
|
||||||
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||||
CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue