From 1c81b2aba868d878c4c30b187395b96c9d382e58 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 28 Mar 2021 00:58:15 -0500 Subject: [PATCH] [nostalgia] Remove Conan setup for GBA builds --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cc95148..70cbe6ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,11 @@ endif() if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") set(OX_BARE_METAL ON) -endif() - -set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake) -if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA" AND EXISTS ${NOSTALGIA_CONAN_PATHS}) - include(${NOSTALGIA_CONAN_PATHS}) +else() + set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake) + if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA" AND EXISTS ${NOSTALGIA_CONAN_PATHS}) + include(${NOSTALGIA_CONAN_PATHS}) + endif() endif() if(OX_BARE_METAL)