diff options
| author | spicyjpeg <88942473+spicyjpeg@users.noreply.github.com> | 2022-02-07 02:44:34 +0100 |
|---|---|---|
| committer | spicyjpeg <88942473+spicyjpeg@users.noreply.github.com> | 2022-02-07 02:44:34 +0100 |
| commit | b554cb1669aef3df239eef8e430082494e4a3041 (patch) | |
| tree | ebefadeb5b3dccf9856353d09338236d40c31e73 | |
| parent | 3f43c466ca282ba14473d974659b5423c7067b08 (diff) | |
| download | psn00bsdk-b554cb1669aef3df239eef8e430082494e4a3041.tar.gz | |
Temporarily disable libflac in mkpsxiso CI build
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | CMakePresets.json | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eca26e..0e46c49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,10 @@ set( ) set( + MKPSXISO_NO_LIBFLAC OFF + CACHE BOOL "Disable libflac integration when building mkpsxiso" +) +set( SKIP_EXAMPLES OFF CACHE BOOL "Skip building SDK examples (not required for installation)" ) @@ -85,18 +89,19 @@ set( -DPSN00BSDK_BUILD_DATE:STRING=${PSN00BSDK_BUILD_DATE} -DPSN00BSDK_GIT_TAG:STRING=${PSN00BSDK_GIT_TAG} -DPSN00BSDK_GIT_COMMIT:STRING=${PSN00BSDK_GIT_COMMIT} + -DMKPSXISO_NO_LIBFLAC:BOOL=${MKPSXISO_NO_LIBFLAC} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} ) set( _sdk_args ${_common_args} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/install_tree + -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/tree ) set( _examples_args ${_common_args} - -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${PROJECT_BINARY_DIR}/install_tree/${CMAKE_INSTALL_LIBDIR}/libpsn00b/cmake/sdk.cmake + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${PROJECT_BINARY_DIR}/tree/${CMAKE_INSTALL_LIBDIR}/libpsn00b/cmake/sdk.cmake -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/examples ) @@ -118,14 +123,14 @@ ExternalProject_Add( SOURCE_DIR ${PROJECT_SOURCE_DIR}/tools BINARY_DIR tools-build CMAKE_CACHE_ARGS ${_sdk_args} - INSTALL_DIR install_tree + INSTALL_DIR tree ) ExternalProject_Add( mkpsxiso SOURCE_DIR ${PROJECT_SOURCE_DIR}/tools/mkpsxiso BINARY_DIR mkpsxiso-build CMAKE_CACHE_ARGS ${_sdk_args} - INSTALL_DIR install_tree + INSTALL_DIR tree ) ExternalProject_Add( libpsn00b @@ -133,7 +138,7 @@ ExternalProject_Add( BINARY_DIR libpsn00b-build CMAKE_GENERATOR ${LIBPSN00B_GENERATOR} CMAKE_CACHE_ARGS ${_sdk_args} - INSTALL_DIR install_tree + INSTALL_DIR tree #DEPENDS tools ) ExternalProject_Add( @@ -158,7 +163,7 @@ foreach( ) install( # THE TRAILING SLASH IS IMPORTANT - DIRECTORY ${PROJECT_BINARY_DIR}/install_tree/${_subdir}/ + DIRECTORY ${PROJECT_BINARY_DIR}/tree/${_subdir}/ DESTINATION ${_subdir} COMPONENT sdk USE_SOURCE_PERMISSIONS diff --git a/CMakePresets.json b/CMakePresets.json index b103270..822d773 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -36,7 +36,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", "BUNDLE_TOOLCHAIN": "ON", - "LIBPSN00B_GENERATOR": "Ninja", + "MKPSXISO_NO_LIBFLAC": "ON", "PSN00BSDK_TARGET": "$env{GCC_TARGET}", "PSN00BSDK_GIT_TAG": "$env{GITHUB_REF_NAME}", "PSN00BSDK_GIT_COMMIT": "$env{GITHUB_SHA}" |