From 1db6cd197e9cca30fe936cb29947505278b04163 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 24 Dec 2021 20:42:43 +0100 Subject: [PATCH 1/2] Fix inconsistant behaviour with install prefix Somehow it was still sometimes not working. I have no idea why that was, but setting is to cache and path fixed it for me. --- src/base/pspdev.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/pspdev.cmake b/src/base/pspdev.cmake index 2c3a8d34..f4b026ce 100644 --- a/src/base/pspdev.cmake +++ b/src/base/pspdev.cmake @@ -15,7 +15,7 @@ SET(CMAKE_EXE_LINKER_FLAGS_INIT "-L${PSPDEV}/lib -L${PSPDEV}/psp/lib -L${PSPDEV} #SET(CMAKE_SHARED_LINKER_FLAGS_INIT "...") #SET(CMAKE_STATIC_LINKER_FLAGS_CONFIG_INIT "...") #SET(CMAKE_STATIC_LINKER_FLAGS_INIT "...") -SET(CMAKE_INSTALL_PREFIX ${PSPDEV}/psp/) +SET(CMAKE_INSTALL_PREFIX "${PSPDEV}/psp" CACHE PATH) SET(CMAKE_FIND_ROOT_PATH ${PSPDEV} ${PSPDEV}/psp ${PSPDEV}/psp/sdk) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) From 34fb512ae2ed5cc6f0bb4f38f3fd80a056635373 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 24 Dec 2021 20:44:40 +0100 Subject: [PATCH 2/2] Add comment to install prefix --- src/base/pspdev.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/pspdev.cmake b/src/base/pspdev.cmake index f4b026ce..9daa3c98 100644 --- a/src/base/pspdev.cmake +++ b/src/base/pspdev.cmake @@ -15,7 +15,7 @@ SET(CMAKE_EXE_LINKER_FLAGS_INIT "-L${PSPDEV}/lib -L${PSPDEV}/psp/lib -L${PSPDEV} #SET(CMAKE_SHARED_LINKER_FLAGS_INIT "...") #SET(CMAKE_STATIC_LINKER_FLAGS_CONFIG_INIT "...") #SET(CMAKE_STATIC_LINKER_FLAGS_INIT "...") -SET(CMAKE_INSTALL_PREFIX "${PSPDEV}/psp" CACHE PATH) +SET(CMAKE_INSTALL_PREFIX "${PSPDEV}/psp" CACHE PATH "install path") SET(CMAKE_FIND_ROOT_PATH ${PSPDEV} ${PSPDEV}/psp ${PSPDEV}/psp/sdk) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)