From 84af8e03abe67702fd7d8580c76f2d91face11b9 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Mon, 25 Jul 2022 22:59:06 +0100
Subject: [PATCH] remove defunct conan variable
---
CMakeLists.txt | 8 -----
cmake/conan-wrangler.cmake | 65 --------------------------------------
2 files changed, 73 deletions(-)
delete mode 100644 cmake/conan-wrangler.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 143ef81..8d4bb2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,13 +4,10 @@ set(namespace "fggl")
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED YES)
-option(FGGL_CONAN "Should we use conan to find missing dependencies?" OFF)
option(FGGL_EXAMPLES "Should we build examples or just the library" ON)
option(FGGL_TESTS "Should we enable the testing suite?" ON)
option(FGGL_DOCS "Should we build documentation?" ON)
-set(CONAN_BUILD_TYPE "Debug")
-
if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
CACHE STRING "")
@@ -26,10 +23,6 @@ project(fggl
include(GNUInstallDirs)
if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-
- # slightly cleaner conan support
- include(cmake/conan-wrangler.cmake)
-
# testing support
include(CTest)
@@ -45,7 +38,6 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
endif()
-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
diff --git a/cmake/conan-wrangler.cmake b/cmake/conan-wrangler.cmake
deleted file mode 100644
index c68e672..0000000
--- a/cmake/conan-wrangler.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-##
-# Conan Wranger
-# Integrate Conan when needed, don't bother when it's not
-##
-
-if ( FGGL_CONAN )
- if ( CONAN_EXPORTED )
- include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
- conan_basic_setup()
- else()
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
- list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
-
- # download conan if not available
- if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
- message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
- file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake"
- "${CMAKE_BINARY_DIR}/conan.cmake")
- endif()
-
- # download and enable dependencies
- include(${CMAKE_BINARY_DIR}/conan.cmake)
- conan_cmake_configure(
- REQUIRES
- opengl/system
- openal/1.21.1
- assimp/5.2.2
- glfw/3.3.7
- glad/0.1.35
- glm/0.9.9.8
- spdlog/1.10.0
- freetype/2.11.1
- bullet3/3.22a
- yaml-cpp/0.7.0
- GENERATORS
- cmake_find_package
- cmake_find_package_multi
- OPTIONS
- glfw:shared=True
- glad:gl_profile=core
- glad:gl_version=4.5
- glad:extensions="GL_ARB_get_program_binary,GL_ARB_shading_language_include"
- BASIC_SETUP
- )
-
- if ( CMAKE_CONFIGURATION_TYPES )
- foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
- conan_cmake_autodetect( settings BUILD_TYPE ${TYPE} )
- conan_cmake_install(
- PATH_OR_REFERENCE .
- BUILD missing
- SETTINGS ${settings}
- )
- endforeach()
- else()
- conan_cmake_autodetect( settings BUILD_TYPE ${TYPE} )
- conan_cmake_install(
- PATH_OR_REFERENCE .
- BUILD missing
- SETTINGS ${settings}
- )
- endif()
- endif()
-
-endif()
\ No newline at end of file
--
GitLab