test code reorganized

Project-10 · Dec 31, 2017 · db078c9 · db078c9
1 parent cdcc4c4
commit db078c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/tests/gtest-all.cpp → 3rdparty/gtest/gtest-all.cpp b/tests/gtest-all.cpp → 3rdparty/gtest/gtest-all.cpp
diff --git a/include/gtest/gtest.h → 3rdparty/gtest/gtest.h b/include/gtest/gtest.h → 3rdparty/gtest/gtest.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,25 +1,25 @@
-file(GLOB TESTS_INCLUDE	${PROJECT_SOURCE_DIR}/include/gtest/gtest.h)
-file(GLOB TESTS_SOURCES	"*.cpp")
+file(GLOB GTEST_SOURCES "${PROJECT_SOURCE_DIR}/3rdparty/gtest/*.cpp")
+file(GLOB TESTS_SOURCES	"*.cpp" )
 file(GLOB TESTS_HEADERS	"*.h")
 
 # Create named folders for the sources within the .vcproj
 # Empty name lists them directly under the .vcproj
-source_group("Include" FILES ${TESTS_INCLUDE})
-source_group("" FILES ${TESTS_SOURCES} ${TESTS_HEADERS}) 
-source_group("Source Files" FILES "main.cpp" "gtest-all.cpp")
+source_group("" FILES  ${TESTS_SOURCES} ${TESTS_HEADERS}) 
+source_group("Source Files" FILES "main.cpp" ${GTEST_SOURCES})
 source_group("Source Files\\Tests" FILES "Tests.h" "Tests.cpp")
 
 
 # Properties -> C/C++ -> General -> Additional Include Directories
-include_directories(${PROJECT_SOURCE_DIR}/include
+include_directories(${PROJECT_SOURCE_DIR}/3rdparty/
+					${PROJECT_SOURCE_DIR}/include
 					${PROJECT_SOURCE_DIR}/modules
 					${OpenCV_INCLUDE_DIRS} 
 				)
 
 # Properties -> Linker -> General -> Additional Library Directories
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
-add_executable(Tests ${TESTS_INCLUDE} ${TESTS_SOURCES} ${TESTS_HEADERS})
+add_executable(Tests ${TESTS_SOURCES} ${TESTS_HEADERS} ${GTEST_SOURCES})
 add_dependencies(Tests DGM)
 
 # Properties->Linker->Input->Additional Dependencies