From 1b2f87197b92ed0af26614be0b92d92384f0c192 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 22 Dec 2016 23:27:18 -0600 Subject: [PATCH] Move CMake install location to devkitARM directory for GBA builds --- Makefile | 2 +- cmake/Modules/GBA.cmake | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index f39c3597c..6f3bd1fa6 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ install: clean: ${ENV_RUN} make -j -C build ARGS="clean" purge: - ${ENV_RUN} rm -rf $(find build -mindepth 1 -maxdepth 1 -type d) + ${ENV_RUN} rm -rf $(shell find build -mindepth 1 -maxdepth 1 -type d) test: ${ENV_RUN} make -j -C build ARGS="test" run: make diff --git a/cmake/Modules/GBA.cmake b/cmake/Modules/GBA.cmake index 7ab59247c..a3f82eb9d 100644 --- a/cmake/Modules/GBA.cmake +++ b/cmake/Modules/GBA.cmake @@ -32,23 +32,12 @@ find_library(GBA_LIBRARY PATHS /lib ) -find_library(FILESYSTEM_LIBRARY - NAMES - filesystem - PATHS - /lib -) -find_library(FAT_LIBRARY - NAMES - fat - PATHS - /lib -) find_path(GBA_INCLUDE_DIR gba.h PATHS /include ) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GBA DEFAULT_MSG GBA_LIBRARY - FAT_LIBRARY FILESYSTEM_LIBRARY) +find_package_handle_standard_args(GBA DEFAULT_MSG GBA_LIBRARY) + +set(CMAKE_INSTALL_PREFIX ${DEVKITARM})