RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

Meta: Install runtime/utility from jakt to make hello-jakt build again

Browse source 
Also add a compile flag that fixes a warning from including <serenity.h>
This commit is contained in:
Andrew Kaster 2022-06-18 15:40:39 -06:00 • committed by Andreas Kling
parent b0f546cd60
commit fef83ed47d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meta/CMake/code_generators.cmake
View file

@ -78,8 +78,8 @@ function(compile_jakt source)
) )
get_property(JAKT_INCLUDE_DIR TARGET Lagom::jakt PROPERTY IMPORTED_INCLUDE_DIRECTORIES) get_property(JAKT_INCLUDE_DIR TARGET Lagom::jakt PROPERTY IMPORTED_INCLUDE_DIRECTORIES)
set_source_files_properties("${output}" PROPERTIES set_source_files_properties("${output}" PROPERTIES
INCLUDE_DIRECTORIES "${JAKT_INCLUDE_DIR};${JAKT_INCLUDE_DIR}/runtime" INCLUDE_DIRECTORIES "${JAKT_INCLUDE_DIR}/runtime"
COMPILE_FLAGS "-Wno-unused-local-typedefs") COMPILE_OPTIONS "-Wno-unused-local-typedefs;-Wno-unused-function")
get_filename_component(output_name ${output} NAME) get_filename_component(output_name ${output} NAME)
add_custom_target(generate_${output_name} DEPENDS ${output}) add_custom_target(generate_${output_name} DEPENDS ${output})
add_dependencies(all_generated generate_${output_name}) add_dependencies(all_generated generate_${output_name})

3
Meta/CMake/jakt.cmake
View file

@ -35,5 +35,6 @@ if (NOT jakt_POPULATED)
install(DIRECTORY "${jakt_SOURCE_DIR}/runtime" install(DIRECTORY "${jakt_SOURCE_DIR}/runtime"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jakt DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jakt
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
PATTERN "*.cpp") PATTERN "*.cpp"
PATTERN "utility")
endif() endif()