Skip to content
This repository was archived by the owner on May 2, 2024. It is now read-only.

Commit c59a99b

Browse files
committed
GTest is fixed
Now it will look inside the tests source folder include/ for the GTest header and the lib/ folder for the libs. Added gtest file filter to .gitignore. Put the FindGTest.cmake in the tests modules folder instead. Removed EntityManager test.
1 parent b8a65cb commit c59a99b

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,7 @@ include/wrapper/
226226
include/cef_*
227227
cef/
228228

229+
##################################
230+
## GTest
231+
##################################
232+
gtest*

tests/CMakeLists.txt

+16
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@ ENDIF(MINGW OR UNIX OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
1010
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/bin/tests)
1111
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
1212

13+
SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/include)
14+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
15+
16+
LINK_DIRECTORIES("${CMAKE_SOURCE_DIR}/lib" "${CMAKE_SOURCE_DIR}/lib")
17+
SET(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib)
18+
19+
20+
set(SigmaIncludeDir CACHE PATH "Sigma's include directory.")
21+
22+
IF (NOT IS_DIRECTORY ${SigmaIncludeDir})
23+
message(SEND_ERROR "Please set the Sigma include directory")
24+
ENDIF (NOT IS_DIRECTORY ${SigmaIncludeDir})
25+
26+
SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${SigmaIncludeDir})
27+
INCLUDE_DIRECTORIES(${SigmaIncludeDir})
28+
1329
set(SigmaTests_SRC "${CMAKE_SOURCE_DIR}")
1430

1531
file(GLOB SigmaTests_SRC "tests/*.h" "main.cpp")

tests/main.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "gtest/gtest.h"
2-
#include "tests/EntityManagerTest.h"
32
#include "tests/PropertyTest.h"
43

54
int main(int argc, char **argv) {
File renamed without changes.

0 commit comments

Comments
 (0)