kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: minor fix for windows

This commit is contained in:
Ken Martin 2004-12-03 09:25:00 -05:00
parent b1c5f1a7ba
commit 0ad63cf5fd
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/CMakeLists.txt
View File

@ -599,6 +599,20 @@ IF(BUILD_TESTING)
--test-command test1 --test-command test1
) )
IF (WIN32)
ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/SubDir"
"${CMake_BINARY_DIR}/Tests/SubDir"
--build-exe-dir "${CMake_BINARY_DIR}/Tests/SubDir/Executable"
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${MAKEPROGRAM}
--build-project SUBDIR
--test-command test
"${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
"${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.obj"
)
ELSE (WIN32)
ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND} ADD_TEST(SubDir ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/SubDir" "${CMake_SOURCE_DIR}/Tests/SubDir"
@ -611,7 +625,8 @@ IF(BUILD_TESTING)
"${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere" "${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
"${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.o" "${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.o"
) )
ENDIF (WIN32)
IF(${CMAKE_GENERATOR} MATCHES "Visual Studio") IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
ADD_TEST(VSExternalInclude ${CMAKE_CTEST_COMMAND} ADD_TEST(VSExternalInclude ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test