kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that macos builds create asset output directories for krbundles

Browse Source
This commit is contained in:
Kearwood Gilbert
2023-12-07 22:44:39 -08:00
parent 74dbd2d95b
commit 73c77251d3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -222,6 +222,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
add_subdirectory(standard_assets) add_subdirectory(standard_assets)
SET(STANDARD_ASSET_LIST_FILE "${CMAKE_BINARY_DIR}/standard_assets_list") SET(STANDARD_ASSET_LIST_FILE "${CMAKE_BINARY_DIR}/standard_assets_list")
SET(STANDARD_ASSET_BUNDLE "${CMAKE_BINARY_DIR}/output/assets/standard_assets.krbundle") SET(STANDARD_ASSET_BUNDLE "${CMAKE_BINARY_DIR}/output/assets/standard_assets.krbundle")
@@ -230,6 +231,7 @@ FOREACH(line ${KRAKEN_STANDARD_ASSETS})
SET(STANDARD_ASSET_LIST_FILE_CONTENTS "${STANDARD_ASSET_LIST_FILE_CONTENTS}${line}\n") SET(STANDARD_ASSET_LIST_FILE_CONTENTS "${STANDARD_ASSET_LIST_FILE_CONTENTS}${line}\n")
ENDFOREACH(line) ENDFOREACH(line)
FILE(WRITE ${STANDARD_ASSET_LIST_FILE} ${STANDARD_ASSET_LIST_FILE_CONTENTS}) FILE(WRITE ${STANDARD_ASSET_LIST_FILE} ${STANDARD_ASSET_LIST_FILE_CONTENTS})
FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/output/assets")
add_custom_command( add_custom_command(
OUTPUT ${STANDARD_ASSET_BUNDLE} OUTPUT ${STANDARD_ASSET_BUNDLE}

5
tests/smoke/hello_cube/CMakeLists.txt
View File

@@ -4,6 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
SET(KRAKEN_CUBE_BUNDLE "${CMAKE_BINARY_DIR}/output/tests/kraken_cube.krbundle") SET(KRAKEN_CUBE_BUNDLE "${CMAKE_BINARY_DIR}/output/tests/kraken_cube.krbundle")
FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/output/tests")
add_custom_command( add_custom_command(
OUTPUT ${KRAKEN_CUBE_BUNDLE} OUTPUT ${KRAKEN_CUBE_BUNDLE}
@@ -21,6 +22,8 @@ add_custom_target(kraken_cube_assets ALL
if (WIN32) if (WIN32)
add_executable(kraken_cube WIN32 main_win.cpp hello_cube.cpp) add_executable(kraken_cube WIN32 main_win.cpp hello_cube.cpp)
add_compile_definitions(UNICODE) add_compile_definitions(UNICODE)
list (APPEND EXTRA_LIBS shcore)
else(WIN32) else(WIN32)
add_executable(kraken_cube main_macos.mm hello_cube.cpp) add_executable(kraken_cube main_macos.mm hello_cube.cpp)
set(CMAKE_CXX_COMPILER "clang++") set(CMAKE_CXX_COMPILER "clang++")
@@ -29,7 +32,7 @@ endif(WIN32)
add_dependencies(kraken_cube kraken_cube_assets) add_dependencies(kraken_cube kraken_cube_assets)
target_include_directories(kraken_cube PRIVATE ${CMAKE_SOURCE_DIR}/hydra/include ${CMAKE_SOURCE_DIR}/kraken/public) target_include_directories(kraken_cube PRIVATE ${CMAKE_SOURCE_DIR}/hydra/include ${CMAKE_SOURCE_DIR}/kraken/public)
TARGET_LINK_LIBRARIES( kraken_cube kraken shcore ${EXTRA_LIBS} ) TARGET_LINK_LIBRARIES( kraken_cube kraken ${EXTRA_LIBS} )
set_target_properties( kraken_cube PROPERTIES set_target_properties( kraken_cube PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/output/tests RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/output/tests