From 577e9ae20c3d2f53d12e64ec96ac2cdcf37f90c4 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Sun, 21 Aug 2022 17:37:45 +0200 Subject: [PATCH] cmake: install the fxSDK sysroot --- CMakeLists.txt | 13 ++++++------- cmake/FindJustUI.cmake | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c6eabe..41726da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,17 +38,16 @@ target_compile_options(${NAME} PUBLIC -Wall -Wextra -std=c11 -Os) target_include_directories(${NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_BINARY_DIR}/include" - "${FXSDK_COMPILER_INSTALL}/include/openlibm") + "${CMAKE_CURRENT_BINARY_DIR}/include") target_link_libraries(${NAME} - Gint::Gint -lopenlibm) + Gint::Gint -lm) install(TARGETS ${NAME} - DESTINATION "${FXSDK_COMPILER_INSTALL}") -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" - DESTINATION "${FXSDK_COMPILER_INSTALL}" + DESTINATION "${FXSDK_LIB}") +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" + DESTINATION "${FXSDK_INCLUDE}" FILES_MATCHING PATTERN "*.h") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/justui/config.h" - DESTINATION "${FXSDK_COMPILER_INSTALL}/include/justui") + DESTINATION "${FXSDK_INCLUDE}/justui") install(FILES cmake/FindJustUI.cmake DESTINATION "${FXSDK_CMAKE_MODULE_PATH}") diff --git a/cmake/FindJustUI.cmake b/cmake/FindJustUI.cmake index b8c2fff..ddad25f 100644 --- a/cmake/FindJustUI.cmake +++ b/cmake/FindJustUI.cmake @@ -3,7 +3,7 @@ include(FindPackageHandleStandardArgs) find_package(Gint 2.1 REQUIRED) -find_simple_library("libjustui-${FXSDK_PLATFORM}.a" include/justui/config.h +find_simple_library("libjustui-${FXSDK_PLATFORM}.a" justui/config.h "J_VERSION" PATH_VAR J_PATH VERSION_VAR J_VERSION) find_package_handle_standard_args(JustUI