diff --git a/CMake/Package.cmake b/CMake/Package.cmake index efe267f..086644d 100644 --- a/CMake/Package.cmake +++ b/CMake/Package.cmake @@ -113,9 +113,11 @@ function(bigfoot_create_package_tests ParentFolder BigfootDependencies) ##################ASAN SETUP################### if(${ASAN}) + message(HELLO) if (MSVC) get_filename_component(MSVC_BIN_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY) set(ASAN_DLL "${MSVC_BIN_DIR}/clang_rt.asan_dynamic-x86_64.dll") + message(HELLO) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E echo "Copying ASan DLL: ${ASAN_DLL} to $" diff --git a/ConanProfiles/Tools/msvc b/ConanProfiles/Tools/msvc index 27ce7bb..aa24cf1 100644 --- a/ConanProfiles/Tools/msvc +++ b/ConanProfiles/Tools/msvc @@ -16,7 +16,4 @@ tools.build:cflags=["/Zc:preprocessor", "/Zc:__STDC__", "/D_CRT_DECLARE_NONSTDC_ tools.build:cxxflags=["/Zc:preprocessor", "/permissive-", "/Zc:__cplusplus", "/Zc:enumTypes", "/Zc:templateScope"] [tool_requires] -!cmake/*: cmake/[>=4.2] - -[options] -Bigfoot/*:build_tests=True \ No newline at end of file +!cmake/*: cmake/[>=4.2] \ No newline at end of file diff --git a/ConanProfiles/clang b/ConanProfiles/clang index d66e323..cbca1b0 100644 --- a/ConanProfiles/clang +++ b/ConanProfiles/clang @@ -29,4 +29,4 @@ tools.cmake.cmaketoolchain:generator=Ninja !cmake/*: cmake/[>=4.2] [options] -Bigfoot/*:build_tests=True \ No newline at end of file +bigfoot/*:build_tests=True \ No newline at end of file diff --git a/ConanProfiles/clang_asan b/ConanProfiles/clang_asan index 55d5f9d..24cf0d6 100644 --- a/ConanProfiles/clang_asan +++ b/ConanProfiles/clang_asan @@ -30,5 +30,5 @@ tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} !cmake/*: cmake/[>=4.2] [options] -Bigfoot/*:asan=True -Bigfoot/*:build_tests=True \ No newline at end of file +bigfoot/*:asan=True +bigfoot/*:build_tests=True \ No newline at end of file diff --git a/ConanProfiles/clang_coverage b/ConanProfiles/clang_coverage index b4e016e..1cec6b0 100644 --- a/ConanProfiles/clang_coverage +++ b/ConanProfiles/clang_coverage @@ -29,5 +29,5 @@ tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} !cmake/*: cmake/[>=4.2] [options] -Bigfoot/*:build_tests=True -Bigfoot/*:coverage=True +bigfoot/*:build_tests=True +bigfoot/*:coverage=True diff --git a/ConanProfiles/msvc b/ConanProfiles/msvc index 88667b0..4096142 100644 --- a/ConanProfiles/msvc +++ b/ConanProfiles/msvc @@ -21,4 +21,4 @@ tools.build:defines=["_HAS_EXCEPTIONS=0"] !cmake/*: cmake/[>=4.2] [options] -Bigfoot/*:build_tests=True \ No newline at end of file +bigfoot/*:build_tests=True \ No newline at end of file diff --git a/ConanProfiles/msvc_asan b/ConanProfiles/msvc_asan index 120bc3f..a6d379c 100644 --- a/ConanProfiles/msvc_asan +++ b/ConanProfiles/msvc_asan @@ -21,5 +21,5 @@ tools.build:defines=["_HAS_EXCEPTIONS=0"] !cmake/*: cmake/[>=4.2] [options] -Bigfoot/*:asan=True -Bigfoot/*:build_tests=True +bigfoot/*:asan=True +bigfoot/*:build_tests=True diff --git a/generate_dependencies.bat b/generate_dependencies.bat index 75d0638..f9a848a 100644 --- a/generate_dependencies.bat +++ b/generate_dependencies.bat @@ -23,8 +23,8 @@ REM Add the remote conan remote add bigfootpackages https://conan.romainboullard.com/artifactory/api/conan/BigfootPackages REM Install dependencies with the specified build option -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True -conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc_asan -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=Release -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc_asan -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=RelWithDebInfo -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True +conan install . --remote=bigfootpackages -pr:h=./ConanProfiles/msvc_asan -pr:b=./ConanProfiles/Tools/msvc %build_option% -of build -s build_type=Debug -o bigfoot/*:build_tests=True -o bigfoot/*:tracy=True -o bigfoot/*:vulkan=True endlocal