From 18388a6b066cb569dedd4df1125974d0d208a503 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Fri, 3 May 2019 18:15:18 +0200 Subject: [PATCH] remove unused glfw3 lib --- CMakeLists.txt | 2 -- cmake/FindGLFW3.cmake | 49 ------------------------------------------- 2 files changed, 51 deletions(-) delete mode 100644 cmake/FindGLFW3.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ce2b632..93add6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,6 @@ MESSAGE(STATUS "VULKAN_SDK = $ENV{VULKAN_SDK}") MESSAGE(STATUS "VK_LAYER_PATH = $ENV{VK_LAYER_PATH}") FIND_PACKAGE(Vulkan REQUIRED) -FIND_PACKAGE(GLFW3) INCLUDE(GNUInstallDirs) @@ -58,7 +57,6 @@ FUNCTION (setup_lib LibName) ) TARGET_LINK_LIBRARIES(${LibName} ${Vulkan_LIBRARIES} - ${GLFW3_LIBRARY} ) INSTALL(TARGETS ${LibName} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake deleted file mode 100644 index 13bbb84..0000000 --- a/cmake/FindGLFW3.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# Locate the glfw3 library -# -# This module defines the following variables: -# -# GLFW3_LIBRARY the name of the library; -# GLFW3_INCLUDE_DIR where to find glfw include files. -# GLFW3_FOUND true if both the GLFW3_LIBRARY and GLFW3_INCLUDE_DIR have been found. -# -# To help locate the library and include file, you can define a -# variable called GLFW3_ROOT which points to the root of the glfw library -# installation. -# -# default search dirs -# -# Cmake file from: https://github.com/daw42/glslcookbook - -set( _glfw3_HEADER_SEARCH_DIRS -"/usr/include" -"/usr/local/include" -"${CMAKE_SOURCE_DIR}/includes" -"C:/Program Files (x86)/glfw/include" ) -set( _glfw3_LIB_SEARCH_DIRS -"/usr/lib" -"/usr/local/lib" -"${CMAKE_SOURCE_DIR}/lib" -"C:/Program Files (x86)/glfw/lib-msvc110" ) - -# Check environment for root search directory -set( _glfw3_ENV_ROOT $ENV{GLFW3_ROOT} ) -if( NOT GLFW3_ROOT AND _glfw3_ENV_ROOT ) - set(GLFW3_ROOT ${_glfw3_ENV_ROOT} ) -endif() - -# Put user specified location at beginning of search -if( GLFW3_ROOT ) - list( INSERT _glfw3_HEADER_SEARCH_DIRS 0 "${GLFW3_ROOT}/include" ) - list( INSERT _glfw3_LIB_SEARCH_DIRS 0 "${GLFW3_ROOT}/lib" ) -endif() - -# Search for the header -FIND_PATH(GLFW3_INCLUDE_DIR "GLFW/glfw3.h" -PATHS ${_glfw3_HEADER_SEARCH_DIRS} ) - -# Search for the library -FIND_LIBRARY(GLFW3_LIBRARY NAMES glfw3 glfw -PATHS ${_glfw3_LIB_SEARCH_DIRS} ) -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW3 DEFAULT_MSG -GLFW3_LIBRARY GLFW3_INCLUDE_DIR) -- 2.47.3