diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-03 12:57:02 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-03 12:57:02 +0100 |
| commit | deb248040c514c98921fec1c36add0e352948d3a (patch) | |
| tree | cb1498de9a82a6b5ed79aeb87427daf73e557db8 /CMakeLists.txt | |
| parent | 5328e90aca93c2d4dc715b43c8460a46a7bb5d78 (diff) | |
| download | YAGE-deb248040c514c98921fec1c36add0e352948d3a.tar.gz YAGE-deb248040c514c98921fec1c36add0e352948d3a.zip | |
Adding cmake and making class depracated
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bc84149..aad9ab05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,20 +49,7 @@ set(YAGE_SOURCES ${PROJECT_SOURCE_DIR}/src/texturecache.cpp ${PROJECT_SOURCE_DIR}/src/window.cpp) -# Initializing google test -# prevents overriding the parent project's compiler/linter settings on windows -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - -# Add googletest directly to our build. This defines -# the gtest and gtest_main targets. -add_subdirectory(${PROJECT_SOURCE_DIR}/googletest) - -# The gtest/gtest_main targets carry header search path -# dependencies automatically when using CMake 2.8.11 or -# later. Otherwise we have to add them here ourselves. -if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include") -endif() +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib) # find libraries find_package(OpenGL REQUIRED) |