修复了一些bug
This commit is contained in:
+1
-23
@@ -13,7 +13,7 @@ find_package(spdlog CONFIG REQUIRED)
|
||||
rcl_add_dependency_action_targets(renderive_env ${renderive_dependencies})
|
||||
library_is_installed_with_rely(renderive_dependencies_installed ${renderive_dependencies})
|
||||
if (NOT renderive_dependencies_installed)
|
||||
set(log "[FATAL_ERROR] renderive_Core 依赖未安装,请先构建 renderive_env 目标")
|
||||
set(log "[FATAL_ERROR] Renderive 依赖未安装,请先构建 renderive_env 目标")
|
||||
rcl_log_append("${log}")
|
||||
return()
|
||||
endif ()
|
||||
@@ -44,24 +44,6 @@ add_library(Renderive_Kernel STATIC
|
||||
target_include_directories(Renderive_Kernel PUBLIC "${root_dir}/Kernel/src")
|
||||
target_compile_features(Renderive_Kernel PUBLIC cxx_std_20)
|
||||
target_link_libraries(Renderive_Kernel PRIVATE Taskflow::Taskflow Threads::Threads)
|
||||
# Preserve the legacy Core target and sources, but keep it out of Radio's build.
|
||||
file(GLOB_RECURSE renderive_legacy_core_sources CONFIGURE_DEPENDS
|
||||
"${root_dir}/Core/*.cpp"
|
||||
"${root_dir}/Core/*.h"
|
||||
"${root_dir}/Core/*.hpp"
|
||||
)
|
||||
add_library(Renderive_Core STATIC EXCLUDE_FROM_ALL ${renderive_legacy_core_sources})
|
||||
target_include_directories(Renderive_Core PUBLIC "${root_dir}")
|
||||
target_compile_features(Renderive_Core PUBLIC cxx_std_20)
|
||||
target_precompile_headers(Renderive_Core PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:${root_dir}/../CPP_Core/src/Psc_Cpp_Core/Base/global_include.h>"
|
||||
)
|
||||
target_link_libraries(Renderive_Core PUBLIC
|
||||
blend2d::blend2d
|
||||
Taskflow::Taskflow
|
||||
MPMCQueue::MPMCQueue
|
||||
Psc_Core_Static
|
||||
)
|
||||
file(GLOB_RECURSE renderive_core2_sources CONFIGURE_DEPENDS
|
||||
"${root_dir}/Core2/*.cpp"
|
||||
"${root_dir}/Core2/*.h"
|
||||
@@ -131,10 +113,6 @@ add_test(NAME Renderive_Qt_Tests
|
||||
"QT_QPA_PLATFORM_PLUGIN_PATH=${renderive_qt_runtime_root}/plugins/platforms"
|
||||
"$<TARGET_FILE:Renderive_Qt_Tests>"
|
||||
)
|
||||
add_executable(Renderive_Core_Tests EXCLUDE_FROM_ALL
|
||||
"${root_dir}/test/Renderive_Core_Tests.cpp"
|
||||
)
|
||||
target_link_libraries(Renderive_Core_Tests PRIVATE Renderive_Core GTest::GTest)
|
||||
if (MSVC)
|
||||
target_compile_options(Renderive_Kernel PRIVATE /utf-8)
|
||||
target_compile_options(Renderive_Core2 PRIVATE /utf-8)
|
||||
|
||||
Reference in New Issue
Block a user