From 73c77251d37e1195b6457ac001f74aeb113a23ef Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Thu, 7 Dec 2023 22:44:39 -0800 Subject: [PATCH] Ensure that macos builds create asset output directories for krbundles --- CMakeLists.txt | 2 ++ tests/smoke/hello_cube/CMakeLists.txt | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d14e9a8..4510060 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,6 +222,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) add_subdirectory(standard_assets) + SET(STANDARD_ASSET_LIST_FILE "${CMAKE_BINARY_DIR}/standard_assets_list") 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") ENDFOREACH(line) FILE(WRITE ${STANDARD_ASSET_LIST_FILE} ${STANDARD_ASSET_LIST_FILE_CONTENTS}) +FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/output/assets") add_custom_command( OUTPUT ${STANDARD_ASSET_BUNDLE} diff --git a/tests/smoke/hello_cube/CMakeLists.txt b/tests/smoke/hello_cube/CMakeLists.txt index e864196..b2e5c97 100644 --- a/tests/smoke/hello_cube/CMakeLists.txt +++ b/tests/smoke/hello_cube/CMakeLists.txt @@ -4,6 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) SET(KRAKEN_CUBE_BUNDLE "${CMAKE_BINARY_DIR}/output/tests/kraken_cube.krbundle") +FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/output/tests") add_custom_command( OUTPUT ${KRAKEN_CUBE_BUNDLE} @@ -21,6 +22,8 @@ add_custom_target(kraken_cube_assets ALL if (WIN32) add_executable(kraken_cube WIN32 main_win.cpp hello_cube.cpp) add_compile_definitions(UNICODE) + list (APPEND EXTRA_LIBS shcore) + else(WIN32) add_executable(kraken_cube main_macos.mm hello_cube.cpp) set(CMAKE_CXX_COMPILER "clang++") @@ -29,7 +32,7 @@ endif(WIN32) add_dependencies(kraken_cube kraken_cube_assets) 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 RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/output/tests