12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in feature/windows-fixes (pull request #268) 

Windows CMake fix for subdirectories without tests
release/4.3a0
Chris Beall 2016-06-20 11:32:18 -04:00
parent aac253e72a 903d29214b
commit f3fce5cb1c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/GtsamTesting.cmake
View File

@ -179,11 +179,17 @@ macro(gtsamAddTestsGlob_impl groupName globPatterns excludedFiles linkLibraries)
set_property(TARGET ${script_name} PROPERTY FOLDER "Unit tests/${groupName}") set_property(TARGET ${script_name} PROPERTY FOLDER "Unit tests/${groupName}")
endforeach() endforeach()
else() else()
#skip folders which don't have any tests
if(NOT script_srcs)
return()
endif()
# Default on MSVC and XCode - combine test group into a single exectuable # Default on MSVC and XCode - combine test group into a single exectuable
set(target_name check_${groupName}_program) set(target_name check_${groupName}_program)
# Add executable # Add executable
add_executable(${target_name} ${script_srcs} ${script_headers}) add_executable(${target_name} "${script_srcs}" ${script_headers})
target_link_libraries(${target_name} CppUnitLite ${linkLibraries}) target_link_libraries(${target_name} CppUnitLite ${linkLibraries})
# Only have a main function in one script - use preprocessor # Only have a main function in one script - use preprocessor
@ -196,7 +202,7 @@ macro(gtsamAddTestsGlob_impl groupName globPatterns excludedFiles linkLibraries)
add_dependencies(check.${groupName} ${target_name}) add_dependencies(check.${groupName} ${target_name})
add_dependencies(check ${target_name}) add_dependencies(check ${target_name})
if(NOT XCODE_VERSION) if(NOT XCODE_VERSION)
add_dependencies(all.tests ${script_name}) add_dependencies(all.tests ${target_name})
endif() endif()
# Add TOPSRCDIR # Add TOPSRCDIR