Fixes
This commit is contained in:
@ -20,8 +20,8 @@ target_include_directories(IACore PUBLIC inc/)
|
||||
target_include_directories(IACore PRIVATE imp/hpp/)
|
||||
|
||||
target_link_libraries(IACore PUBLIC
|
||||
zlibstatic
|
||||
libzstd_static
|
||||
ZLIB::ZLIB
|
||||
tl::expected
|
||||
glaze::glaze
|
||||
simdjson::simdjson
|
||||
@ -35,17 +35,17 @@ target_link_libraries(IACore PRIVATE
|
||||
OpenSSL::Crypto
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(IACore PUBLIC mimalloc-static)
|
||||
|
||||
if(MSVC)
|
||||
target_link_options(IACore PUBLIC "/INCLUDE:mi_version")
|
||||
else()
|
||||
target_link_options(IACore PUBLIC "")
|
||||
endif()
|
||||
else()
|
||||
target_link_libraries(IACore PUBLIC mimalloc)
|
||||
endif()
|
||||
#if(WIN32)
|
||||
# target_link_libraries(IACore PUBLIC mimalloc-static)
|
||||
#
|
||||
# if(MSVC)
|
||||
# target_link_options(IACore PUBLIC "/INCLUDE:mi_version")
|
||||
# else()
|
||||
# target_link_options(IACore PUBLIC "")
|
||||
# endif()
|
||||
#else()
|
||||
# target_link_libraries(IACore PUBLIC mimalloc)
|
||||
#endif()
|
||||
|
||||
target_precompile_headers(IACore PUBLIC inc/IACore/PCH.hpp)
|
||||
|
||||
@ -64,3 +64,8 @@ target_compile_definitions(IACore PRIVATE
|
||||
CPPHTTPLIB_ZLIB_SUPPORT
|
||||
NOMINMAX
|
||||
)
|
||||
|
||||
target_compile_definitions(IACore PUBLIC
|
||||
$<$<CONFIG:Debug>:__IA_DEBUG=1>
|
||||
$<$<CONFIG:Release>:__IA_DEBUG=0>
|
||||
)
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#include <IACore/IACore.hpp>
|
||||
#include <IACore/Logger.hpp>
|
||||
|
||||
#include <mimalloc-new-delete.h>
|
||||
// #include <mimalloc-new-delete.h>
|
||||
|
||||
namespace IACore
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user