From fe36c99f98c0833287d4ba045a6952d18b04c25a Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Fri, 22 Jan 2021 16:12:06 +0100 Subject: [PATCH] cmake: reconfigure based on Makefile, not folder This way [fxsdk build-*] will reconfigure if CMake fails the first time. --- fxsdk/fxsdk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fxsdk/fxsdk.sh b/fxsdk/fxsdk.sh index 5779b3d..81b7426 100755 --- a/fxsdk/fxsdk.sh +++ b/fxsdk/fxsdk.sh @@ -168,7 +168,7 @@ fxsdk_build() { fxsdk_build_fx() { # CMake version; automatically configure if [[ -e "CMakeLists.txt" ]]; then - if [[ ! -e "build-fx" ]]; then + if [[ ! -e "build-fx/Makefile" ]]; then cmake -B build-fx \ -DCMAKE_MODULE_PATH="$PREFIX/lib/cmake/fxsdk" \ -DCMAKE_TOOLCHAIN_FILE="$PREFIX/lib/cmake/fxsdk/FX9860G.cmake" @@ -183,7 +183,7 @@ fxsdk_build_fx() { fxsdk_build_cg() { # CMake version; automatically configure if [[ -e "CMakeLists.txt" ]]; then - if [[ ! -e "build-cg" ]]; then + if [[ ! -e "build-cg/Makefile" ]]; then cmake -B build-cg \ -DCMAKE_MODULE_PATH="$PREFIX/lib/cmake/fxsdk" \ -DCMAKE_TOOLCHAIN_FILE="$PREFIX/lib/cmake/fxsdk/FXCG50.cmake"