From 30befdd2cf9efd420157bf8a6e60c9152722e60c Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Tue, 25 May 2021 20:56:20 +0200 Subject: [PATCH] cmake: automatically find libraries in FXSDK_PREFIX This paves the way for out-of-compiler installs which might become a relevant thing for packaging and dual gint/PrizmSDK users (if it ever happens). --- fxsdk/cmake/FX9860G.cmake | 11 ++++++++--- fxsdk/cmake/FXCG50.cmake | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/fxsdk/cmake/FX9860G.cmake b/fxsdk/cmake/FX9860G.cmake index c35c758..d166be5 100644 --- a/fxsdk/cmake/FX9860G.cmake +++ b/fxsdk/cmake/FX9860G.cmake @@ -27,11 +27,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(FXSDK_CMAKE_MODULE_PATH "${FXSDK_CMAKE_MODULE_PATH}") +# Add the fxSDK prefix path to the search +set(FXSDK_PREFIX "$ENV{FXSDK_PREFIX}") +foreach(DIR IN LISTS FXSDK_PREFIX) + include_directories("${DIR}/include") + link_directories("${DIR}/lib") +endforeach() + # Determine compiler install path execute_process( - COMMAND ${CMAKE_C_COMPILER} --print-search-dirs - COMMAND head -n 1 - COMMAND sed -E "s/^[^:]+: //" + COMMAND ${CMAKE_C_COMPILER} --print-file-name=. OUTPUT_VARIABLE FXSDK_COMPILER_INSTALL OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/fxsdk/cmake/FXCG50.cmake b/fxsdk/cmake/FXCG50.cmake index 4b8d24c..b8c7645 100644 --- a/fxsdk/cmake/FXCG50.cmake +++ b/fxsdk/cmake/FXCG50.cmake @@ -27,11 +27,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(FXSDK_CMAKE_MODULE_PATH "${FXSDK_CMAKE_MODULE_PATH}") +# Add the fxSDK prefix path to the search +set(FXSDK_PREFIX "$ENV{FXSDK_PREFIX}") +foreach(DIR IN LISTS FXSDK_PREFIX) + include_directories("${DIR}/include") + link_directories("${DIR}/lib") +endforeach() + # Determine compiler install path execute_process( - COMMAND ${CMAKE_C_COMPILER} --print-search-dirs - COMMAND head -n 1 - COMMAND sed -E "s/^[^:]+: //" + COMMAND ${CMAKE_C_COMPILER} --print-file-name=. OUTPUT_VARIABLE FXSDK_COMPILER_INSTALL OUTPUT_STRIP_TRAILING_WHITESPACE )