diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-15 16:33:40 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-16 23:18:15 +0300 |
| commit | ed64b1593b17e7531307cf8730e9b6d3814316af (patch) | |
| tree | c7a91ab52aba2dabb131913822403558b591696c | |
| parent | a71e672dfaef8a5cdb13f2331b2e6e74c182ac45 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-remove_glfw.tar.gz | |
[build] Remove glfw submoduleupstream/tmpsantos-remove_glfw
We use it from the system.
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | vendor/glfw | 0 | ||||
| -rw-r--r-- | vendor/glfw.cmake | 30 |
3 files changed, 0 insertions, 33 deletions
diff --git a/.gitmodules b/.gitmodules index fbecf14c99..2c286a1b27 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "vendor/benchmark"] path = vendor/benchmark url = https://github.com/google/benchmark.git -[submodule "vendor/glfw"] - path = vendor/glfw - url = https://github.com/glfw/glfw.git [submodule "vendor/eternal"] path = vendor/eternal url = https://github.com/mapbox/eternal.git diff --git a/vendor/glfw b/vendor/glfw deleted file mode 160000 -Subproject 53c8c72c676ca97c10aedfe3d0eb4271c5b23db diff --git a/vendor/glfw.cmake b/vendor/glfw.cmake deleted file mode 100644 index 2a554df731..0000000000 --- a/vendor/glfw.cmake +++ /dev/null @@ -1,30 +0,0 @@ -set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build the GLFW example programs" FORCE) -set(GLFW_BUILD_TESTS OFF CACHE BOOL "Build the GLFW test programs" FORCE) -set(GLFW_BUILD_DOCS OFF CACHE BOOL "Build the GLFW documentation" FORCE) -set(GLFW_INSTALL OFF CACHE BOOL "Generate installation target" FORCE) - -unset(CMAKE_C_VISIBILITY_PRESET) -add_subdirectory(vendor/glfw) -set(CMAKE_C_VISIBILITY_PRESET hidden) - -target_compile_options( - glfw - PRIVATE - -Wno-shadow - -Wno-unused-parameter - -Wno-sign-compare - -Wno-missing-field-initializers -) - -if(APPLE) - # Don't show OpenGL deprecation warnings. - target_compile_options(glfw PRIVATE -Wno-deprecated-declarations -Wno-unguarded-availability-new) - - # get_target_property(DEPLOYMENT_TARGET_VERSION glfw MACOSX_DEPLOYMENT_TARGET) message(STATUS "target: ${DEPLOYMENT_TARGET_VERSION}") - set_target_properties(glfw PROPERTIES OSX_DEPLOYMENT_TARGET 10.11) -endif() - -if(CMAKE_GENERATOR STREQUAL "Xcode") - # The Xcode generator always tries to link from this directory instead of the actual output dir. - set_target_properties(glfw PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>") -endif() |