From 5abd67691787d94f16531e9cfa05a9a477f3a5b1 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 7 Jun 2022 04:28:55 +0200 Subject: [PATCH] Allow empty default values to the dep_option macro --- CMakeLists.txt | 5 ----- cmake/macros.cmake | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5e0e344e..bf3f42710 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -483,11 +483,6 @@ set(SDL_SHARED ${SDL_SHARED_ENABLED_BY_DEFAULT} CACHE BOOL "Build a shared versi set(SDL_STATIC ${SDL_STATIC_ENABLED_BY_DEFAULT} CACHE BOOL "Build a static version of the library") set(SDL_TEST ${SDL_TEST_ENABLED_BY_DEFAULT} CACHE BOOL "Build the SDL2_test library") -# Some platforms have CMAKE_POSITION_INDEPENDENT_CODE not defined -if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE FALSE) -endif() - dep_option(SDL_STATIC_PIC "Static version of the library should be built with Position Independent Code" "${CMAKE_POSITION_INDEPENDENT_CODE}" "SDL_STATIC" OFF) dep_option(SDL_TESTS "Build the test directory" OFF SDL_TEST OFF) set_option(SDL_INSTALL_TESTS "Install test-cases" OFF) diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 62621ddfa..af7512257 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -17,8 +17,8 @@ macro(SET_OPTION _NAME _DESC) endmacro() macro(DEP_OPTION _NAME _DESC _DEFLT _DEPTEST _FAILDFLT) - add_to_alloptions(${_NAME}) - cmake_dependent_option(${_NAME} ${_DESC} ${_DEFLT} ${_DEPTEST} ${_FAILDFLT}) + add_to_alloptions("${_NAME}") + cmake_dependent_option("${_NAME}" "${_DESC}" "${_DEFLT}" "${_DEPTEST}" "${_FAILDFLT}") endmacro() macro(OPTION_STRING _NAME _DESC _VALUE)