add basic types and fix cmake
This commit is contained in:
@@ -56,6 +56,7 @@ set_property(TARGET ${TARGET_LIB_NAME} PROPERTY INCLUDE_DIRECTORIES
|
||||
"${LIB_INCLUDE_PATH}"
|
||||
)
|
||||
target_link_libraries(${TARGET_LIB_NAME} Qt5::Core)
|
||||
target_compile_definitions(${TARGET_LIB_NAME} PRIVATE TOML_FLOAT_CHARCONV=0)
|
||||
|
||||
set(CMAKE_AUTOMOC OFF)
|
||||
|
||||
@@ -64,7 +65,8 @@ unset(RELATIVE_HDRS)
|
||||
unset(RELATIVE_SRCS)
|
||||
unset(HDRS)
|
||||
unset(SRCS)
|
||||
unset(LIB_INCLUDE_PATH)
|
||||
# LIB_INCLUDE_PATH (populated by lib/ and external/ subdirectories) is kept
|
||||
# in scope so the test target below can also reach those headers.
|
||||
|
||||
|
||||
# ============================================================
|
||||
@@ -90,6 +92,7 @@ target_link_libraries(${TARGET_UI_NAME} INTERFACE
|
||||
target_include_directories(${TARGET_UI_NAME} INTERFACE
|
||||
"${TARGET_UI_INCLUDE_DIRS}"
|
||||
"${TARGET_LIB_INCLUDE_DIRS}"
|
||||
"${LIB_INCLUDE_PATH}"
|
||||
)
|
||||
|
||||
|
||||
@@ -166,6 +169,10 @@ set_property(TARGET ${TARGET_TEST_NAME} PROPERTY CXX_STANDARD 17)
|
||||
set_property(TARGET ${TARGET_TEST_NAME} PROPERTY INCLUDE_DIRECTORIES
|
||||
"${TARGET_TEST_INCLUDE_DIRS}"
|
||||
"${TARGET_LIB_INCLUDE_DIRS}"
|
||||
"${LIB_INCLUDE_PATH}"
|
||||
)
|
||||
target_compile_definitions(${TARGET_TEST_NAME} PRIVATE
|
||||
DOTA_FACTORY_CONFIG_DIR="${CMAKE_SOURCE_DIR}/bin/config"
|
||||
)
|
||||
target_link_libraries(${TARGET_TEST_NAME} ${TARGET_LIB_NAME})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user