diff options
| author | raysan5 <raysan5@gmail.com> | 2018-02-04 12:26:33 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2018-02-04 12:26:33 +0100 |
| commit | 8f287e72d25c635df52342e9c00d417dccd33e41 (patch) | |
| tree | 2f47798a54e11a0998a837ac22df053496894c55 | |
| parent | 70e0070a853a76c9ffe5518c2861bf24396e9676 (diff) | |
| parent | cb66c89dfa096239be8522fc3a518c94b76d0cd4 (diff) | |
| download | raylib-8f287e72d25c635df52342e9c00d417dccd33e41.tar.gz raylib-8f287e72d25c635df52342e9c00d417dccd33e41.zip | |
Merge branch 'develop' of https://github.com/raysan5/raylib into develop
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | utils.cmake | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b22892eb..55d8357d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_install: script: - mkdir build - cd build - - cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=ON -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON -DWITH_SYSTEM_GLFW=IF_POSSIBLE .. + - cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=ON -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON -DUSE_EXTERNAL_GLFW=IF_POSSIBLE .. - make VERBOSE=1 - make package diff --git a/utils.cmake b/utils.cmake index ad709b22..68fd1f76 100644 --- a/utils.cmake +++ b/utils.cmake @@ -1,8 +1,8 @@ # All sorts of things that we need cross project cmake_minimum_required(VERSION 2.8.0) -set(WITH_SYSTEM_GLFW OFF CACHE STRING "Link raylib against system GLFW instead of embedded one") -set_property(CACHE WITH_SYSTEM_GLFW PROPERTY STRINGS ON OFF IF_POSSIBLE) +set(USE_EXTERNAL_GLFW OFF CACHE STRING "Link raylib against system GLFW instead of embedded one") +set_property(CACHE USE_EXTERNAL_GLFW PROPERTY STRINGS ON OFF IF_POSSIBLE) # Linking for OS X -framework options # Will do nothing on other OSes @@ -36,9 +36,9 @@ else() endif() endif() -if(WITH_SYSTEM_GLFW STREQUAL "ON") +if(USE_EXTERNAL_GLFW STREQUAL "ON") find_package(glfw3 3.2.1 REQUIRED) -elseif(WITH_SYSTEM_GLFW STREQUAL "IF_POSSIBLE") +elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") find_package(glfw3 3.2.1) endif() if (glfw3_FOUND) |