From 84101548f6c4f9f708fc4a43a1d735f622b72ad8 Mon Sep 17 00:00:00 2001 From: Jesse Talavera-Greenberg Date: Sat, 24 Jun 2023 12:53:27 -0400 Subject: [PATCH] Move ENABLE_ options to ConfigureFeatures.cmake --- CMakeLists.txt | 1 - cmake/ConfigureFeatures.cmake | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94ee81f..bbba2a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,6 @@ FetchContent_GetProperties(libretro-common) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${FETCHCONTENT_BASE_DIR}/melonds-src/cmake" "${CMAKE_MODULE_PATH}") FetchContent_MakeAvailable(melonDS libretro-common) -option(ENABLE_THREADS "Build with thread support, if supported by the target." ON) include(cmake/ConfigureFeatures.cmake) include(cmake/libretro-common.cmake) diff --git a/cmake/ConfigureFeatures.cmake b/cmake/ConfigureFeatures.cmake index d73653d..4451813 100644 --- a/cmake/ConfigureFeatures.cmake +++ b/cmake/ConfigureFeatures.cmake @@ -1,6 +1,10 @@ # Detects the presence of various libraries or functions and sets the appropriate HAVE_* variables. # Other files are used to actually configure the build. +option(ENABLE_EGL "Build with EGL support, if supported by the target." OFF) +option(ENABLE_THREADS "Build with thread support, if supported by the target." ON) +option(ENABLE_ZLIB "Build with zlib support, if supported by the target." ON) + if (ENABLE_THREADS) find_package(Threads)