diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-20 23:01:12 +0100 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-09-20 23:01:12 +0100 |
| commit | 977b8f16d7ef43101b6ef588f9610f34285fa7e6 (patch) | |
| tree | 25446bc027685765a79492d3b68c49bdee53612b /lib | |
| parent | b869c926429e9316617a643960a97fad64dd42ef (diff) | |
| download | YAGE-977b8f16d7ef43101b6ef588f9610f34285fa7e6.tar.gz YAGE-977b8f16d7ef43101b6ef588f9610f34285fa7e6.zip | |
Replacing SDL by glfw
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 17 | ||||
| m--------- | lib/glfw | 0 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 0f07326f..93f1bd1c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -5,22 +5,29 @@ # See file LICENSE for more details # ---------------------------------------------------------------------------- -if(${ENABLE_TESTING}) +if($ENV{UNIT_TESTS}) # Initializing google test # prevents overriding the parent project's compiler/linter settings on windows set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + set(BUILD_GTEST ON CACHE BOOL "" FORCE) + set(BUILD_GMOCK OFF CACHE BOOL "" FORCE) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/googletest") + add_subdirectory(${CMAKE_CURRENT_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") + include_directories(${gtest_SOURCE_DIR}/include) endif() endif() -# include headers for rapidjson, no need to build it -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include") +include_directories(${rapidjson}/include) + +# setting up glfw +set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) +set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) +set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw) diff --git a/lib/glfw b/lib/glfw new file mode 160000 +Subproject 999f3556fdd80983b10051746264489f2cb1ef1 |