Asan

Bin2CPP/Sources/Bin2CPPExe/CMakeLists.txt

@@ -19,11 +19,12 @@ target_sources(${PROJECT_NAME}
         ${SOURCES}
 )
 
+target_compile_options(${PROJECT_NAME} PRIVATE ${BIN2CPP_CXX_FLAGS})
+target_link_options(${PROJECT_NAME} PRIVATE ${BIN2CPP_EXE_LINK_FLAGS})
+
 target_link_libraries(${PROJECT_NAME} PUBLIC CLI11::CLI11 Bin2CPPLib)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_DL_LIBS})
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Src FILES ${SOURCES})
 
-set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bin2CPP/${ParentFolder})
-
-bin2cpp_setup_dependencies("Bin2CPPExe")
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Bin2CPP/${ParentFolder})

Bin2CPP/Sources/Bin2CPPLib/CMakeLists.txt

@@ -20,13 +20,18 @@ target_sources(${PROJECT_NAME}
         ${SOURCES}
 )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC EASTL::EASTL mimalloc quill::quill $<$<CONFIG:Debug,RelWithDebInfo>:cpptrace::cpptrace>)
+target_compile_options(${PROJECT_NAME} PRIVATE ${BINN2CPP_CXX_FLAGS})
+
+target_link_libraries(${PROJECT_NAME} PUBLIC 
+        EASTL::EASTL
+        $<$<CONFIG:Debug,RelWithDebInfo>:mimalloc-asan>
+        $<$<CONFIG:Release>:mimalloc-static>
+        quill::quill
+        $<$<CONFIG:Debug,RelWithDebInfo>:cpptrace::cpptrace>)
 
 target_compile_definitions(${PROJECT_NAME}
         PUBLIC QUILL_NO_EXCEPTIONS
-        PUBLIC QUILL_DISABLE_NON_PREFIXED_MACROS
-
-        PUBLIC MI_SHARED_LIB)
+        PUBLIC QUILL_DISABLE_NON_PREFIXED_MACROS)
 
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/MimallocImpl.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 

Bin2CPP/Tests/Bin2CPPLib/CMakeLists.txt

@@ -18,6 +18,9 @@ target_sources(${PROJECT_NAME}
         ${TEST_SOURCES}
 )
 
+target_compile_options(${PROJECT_NAME} PRIVATE ${BIN2CPP_CXX_FLAGS})
+target_link_options(${PROJECT_NAME} PRIVATE ${BIN2CPP_EXE_LINK_FLAGS})
+
 target_link_libraries(${PROJECT_NAME} PRIVATE gtest::gtest Bin2CPPLib)
 
 include(GoogleTest)
@@ -48,6 +51,4 @@ add_custom_target(${PROJECT_NAME}Fixture
 
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}Fixture)
 
-set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/Tests/Bin2CPP/${ParentFolder})
-
-bin2cpp_setup_dependencies("Tests/Bin2CPP")
+set_target_properties(${PROJECT_NAME}Fixture PROPERTIES FOLDER UtilityTargets/Tests/Bin2CPP/${ParentFolder})