From 126d1506acec0fd331916e33b85242b8d1045e1f Mon Sep 17 00:00:00 2001
From: Lephe <sebastien.michelland@protonmail.com>
Date: Fri, 19 Aug 2022 16:35:47 +0200
Subject: [PATCH] cmake: install in the fxSDK sysroot
---
CMakeLists.txt | 13 ++++++-------
cmake/FindGint.cmake | 26 ++++++++++----------------
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7a26dd..f2f292a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,8 +238,7 @@ fxconv_declare_assets(${ASSETS_FX} ${ASSETS_CG})
include_directories(
"${PROJECT_SOURCE_DIR}/include"
- "${PROJECT_BINARY_DIR}/include"
- "${FXSDK_COMPILER_INSTALL}/include/openlibm")
+ "${PROJECT_BINARY_DIR}/include")
add_compile_options(-Wall -Wextra -std=c11 -Os -fstrict-volatile-bitfields -mtas)
if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
@@ -259,16 +258,16 @@ endif()
set_target_properties("${NAME}" PROPERTIES OUTPUT_NAME "${NAME}")
# Library file
-install(TARGETS "${NAME}" DESTINATION "${FXSDK_COMPILER_INSTALL}")
+install(TARGETS "${NAME}" DESTINATION "${FXSDK_LIB}")
# Linker script
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_SCRIPT}"
- DESTINATION "${FXSDK_COMPILER_INSTALL}")
+ DESTINATION "${FXSDK_LIB}")
# Headers
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
- DESTINATION "${FXSDK_COMPILER_INSTALL}"
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/"
+ DESTINATION "${FXSDK_INCLUDE}"
FILES_MATCHING PATTERN "*.h")
# Auto-generated config header
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/gint/config.h"
- DESTINATION "${FXSDK_COMPILER_INSTALL}/include/gint")
+ DESTINATION "${FXSDK_INCLUDE}/gint")
# CMake module to find gint
install(FILES cmake/FindGint.cmake DESTINATION "${FXSDK_CMAKE_MODULE_PATH}")
diff --git a/cmake/FindGint.cmake b/cmake/FindGint.cmake
index e9a7a4f..5d91d24 100644
--- a/cmake/FindGint.cmake
+++ b/cmake/FindGint.cmake
@@ -14,18 +14,16 @@ endif()
execute_process(
COMMAND ${CMAKE_C_COMPILER} -print-file-name=libgint-${PC}.a
OUTPUT_VARIABLE GINT_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-execute_process(
- COMMAND ${CMAKE_C_COMPILER} -print-file-name=include/gint/config.h
- OUTPUT_VARIABLE GINT_CONFIG_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND ${CMAKE_C_COMPILER} -print-file-name=libc.a
OUTPUT_VARIABLE FXLIBC_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(
+ COMMAND fxsdk path include
+ OUTPUT_VARIABLE FXSDK_INCLUDE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(GINT_CONFIG_PATH "${FXSDK_INCLUDE}/gint/config.h")
if("${GINT_PATH}" STREQUAL "libgint-${PC}.a")
unset(PATH_TO_LIBGINT)
@@ -49,8 +47,7 @@ endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Gint
REQUIRED_VARS PATH_TO_FXLIBC PATH_TO_LIBGINT
- VERSION_VAR GINT_VERSION
-)
+ VERSION_VAR GINT_VERSION)
if(Gint_FOUND)
if(NOT TARGET Gint::Fxlibc)
@@ -58,8 +55,7 @@ if(Gint_FOUND)
endif()
set_target_properties(Gint::Fxlibc PROPERTIES
IMPORTED_LOCATION "${FXLIBC_PATH}"
- INTERFACE_LINK_OPTIONS "-lgcc"
- )
+ INTERFACE_LINK_OPTIONS "-lgcc")
if(NOT TARGET Gint::Gint)
add_library(Gint::Gint UNKNOWN IMPORTED)
@@ -68,10 +64,8 @@ if(Gint_FOUND)
IMPORTED_LOCATION "${GINT_PATH}"
INTERFACE_COMPILE_OPTIONS -fstrict-volatile-bitfields
INTERFACE_COMPILE_DEFINITIONS "${INTF_DEFN}"
- INTERFACE_INCLUDE_DIRECTORIES "${FXSDK_COMPILER_INSTALL}/include/openlibm"
INTERFACE_LINK_LIBRARIES "-lopenlibm;-lgcc"
- INTERFACE_LINK_OPTIONS "${INTF_LINK}"
- )
+ INTERFACE_LINK_OPTIONS "${INTF_LINK}")
target_link_libraries(Gint::Gint INTERFACE Gint::Fxlibc)
target_link_libraries(Gint::Fxlibc INTERFACE Gint::Gint)