dev0/IACore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
dev0
2025-12-09 02:34:16 +05:30
parent 3ed23336e2
commit 71d83859f5
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
CMake/FindDeps.cmake
View File

@ -1,5 +1,7 @@
include(FetchContent) include(FetchContent)
set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Force static libs")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=int-conversion") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=int-conversion")
add_compile_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_compile_definitions(-D_ITERATOR_DEBUG_LEVEL=0)
@ -37,8 +39,8 @@ FetchContent_Declare(
FetchContent_Declare( FetchContent_Declare(
ZLIB ZLIB
GIT_REPOSITORY https://github.com/madler/zlib.git GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git
GIT_TAG v1.3.1 GIT_TAG 2.3.2
SYSTEM SYSTEM
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
@ -52,16 +54,16 @@ FetchContent_Declare(
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
FetchContent_Declare( #FetchContent_Declare(
mimalloc # mimalloc
GIT_REPOSITORY https://github.com/microsoft/mimalloc.git # GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
GIT_TAG v3.0.10 # GIT_TAG v3.0.10
SYSTEM # SYSTEM
EXCLUDE_FROM_ALL # EXCLUDE_FROM_ALL
PATCH_COMMAND ${CMAKE_COMMAND} # PATCH_COMMAND ${CMAKE_COMMAND}
-DSOURCE_DIR=<SOURCE_DIR> # -DSOURCE_DIR=<SOURCE_DIR>
-P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/PatchMimalloc.cmake # -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/PatchMimalloc.cmake
) #)
FetchContent_Declare( FetchContent_Declare(
tl-expected tl-expected
@ -79,19 +81,23 @@ FetchContent_Declare(
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
set(MI_BUILD_SHARED ON CACHE BOOL "" FORCE) #set(MI_OVERRIDE ON CACHE BOOL "" FORCE)
set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE) #set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE)
set(MI_BUILD_TESTS OFF CACHE BOOL "" FORCE) #set(MI_BUILD_TESTS OFF CACHE BOOL "" FORCE)
#set(MI_BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(EXPECTED_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(EXPECTED_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(HTTPLIB_REQUIRE_OPENSSL OFF CACHE BOOL "" FORCE) set(HTTPLIB_REQUIRE_OPENSSL OFF CACHE BOOL "" FORCE)
set(HTTPLIB_REQUIRE_ZLIB OFF CACHE BOOL "" FORCE) set(HTTPLIB_REQUIRE_ZLIB OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(httplib nlohmann_json glaze simdjson ZLIB zstd mimalloc tl-expected unordered_dense) set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)
if(NOT TARGET ZLIB::ZLIB) set(ZLIB_COMPAT ON CACHE BOOL "" FORCE)
add_library(ZLIB::ZLIB ALIAS zlibstatic) set(ZLIB_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
endif()
FetchContent_MakeAvailable(httplib nlohmann_json glaze simdjson ZLIB zstd tl-expected unordered_dense #mimalloc
)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)

13
CMakeLists.txt
View File

@ -18,18 +18,7 @@ include(CMake/FindDeps.cmake)
# Default to ON if root, OFF if dependency # Default to ON if root, OFF if dependency
option(IACore_BUILD_TESTS "Build unit tests" ${PROJECT_IS_TOP_LEVEL}) option(IACore_BUILD_TESTS "Build unit tests" ${PROJECT_IS_TOP_LEVEL})
if(CMAKE_BUILD_TYPE STREQUAL "Debug") message(STATUS "Configured IACore for Multi-Config (Debug/Release rules generated)")
message(STATUS "Configuring IACore for Debug..")
add_compile_options(-O0 -g)
add_compile_definitions("__IA_DEBUG=1")
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
message(STATUS "Configuring IACore for Release..")
add_compile_options(-O3 -g0)
add_compile_definitions("__IA_DEBUG=0")
else()
message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\"")
endif()
message(STATUS "Detected Compiler ID: ${CMAKE_CXX_COMPILER_ID}") message(STATUS "Detected Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
# Check if the compiler is MSVC (cl.exe), but allow Clang acting like MSVC (clang-cl) # Check if the compiler is MSVC (cl.exe), but allow Clang acting like MSVC (clang-cl)

29
Src/IACore/CMakeLists.txt
View File

@ -20,8 +20,8 @@ target_include_directories(IACore PUBLIC inc/)
target_include_directories(IACore PRIVATE imp/hpp/) target_include_directories(IACore PRIVATE imp/hpp/)
target_link_libraries(IACore PUBLIC target_link_libraries(IACore PUBLIC
zlibstatic
libzstd_static libzstd_static
ZLIB::ZLIB
tl::expected tl::expected
glaze::glaze glaze::glaze
simdjson::simdjson simdjson::simdjson
@ -35,17 +35,17 @@ target_link_libraries(IACore PRIVATE
OpenSSL::Crypto OpenSSL::Crypto
) )
if(WIN32) #if(WIN32)
target_link_libraries(IACore PUBLIC mimalloc-static) # target_link_libraries(IACore PUBLIC mimalloc-static)
#
if(MSVC) # if(MSVC)
target_link_options(IACore PUBLIC "/INCLUDE:mi_version") # target_link_options(IACore PUBLIC "/INCLUDE:mi_version")
else() # else()
target_link_options(IACore PUBLIC "") # target_link_options(IACore PUBLIC "")
endif() # endif()
else() #else()
target_link_libraries(IACore PUBLIC mimalloc) # target_link_libraries(IACore PUBLIC mimalloc)
endif() #endif()
target_precompile_headers(IACore PUBLIC inc/IACore/PCH.hpp) target_precompile_headers(IACore PUBLIC inc/IACore/PCH.hpp)
@ -64,3 +64,8 @@ target_compile_definitions(IACore PRIVATE
CPPHTTPLIB_ZLIB_SUPPORT CPPHTTPLIB_ZLIB_SUPPORT
NOMINMAX NOMINMAX
) )
target_compile_definitions(IACore PUBLIC
$<$<CONFIG:Debug>:__IA_DEBUG=1>
$<$<CONFIG:Release>:__IA_DEBUG=0>
)

2
Src/IACore/imp/cpp/IACore.cpp
View File

@ -17,7 +17,7 @@
#include <IACore/IACore.hpp> #include <IACore/IACore.hpp>
#include <IACore/Logger.hpp> #include <IACore/Logger.hpp>
#include <mimalloc-new-delete.h> // #include <mimalloc-new-delete.h>
namespace IACore namespace IACore
{ {