diff --git a/dep/winpixeventruntime/CMakeLists.txt b/dep/winpixeventruntime/CMakeLists.txt new file mode 100644 index 000000000..fd4957b82 --- /dev/null +++ b/dep/winpixeventruntime/CMakeLists.txt @@ -0,0 +1,13 @@ +add_library(WinPixEventRuntime::WinPixEventRuntime UNKNOWN IMPORTED GLOBAL) + +if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") + set_target_properties(WinPixEventRuntime::WinPixEventRuntime PROPERTIES + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/libarm64/WinPixEventRuntime.lib" + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" + ) +else() + set_target_properties(WinPixEventRuntime::WinPixEventRuntime PROPERTIES + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/lib64/WinPixEventRuntime.lib" + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include" + ) +endif() diff --git a/dep/msvc/winpixeventruntime/WinPixEventRuntime.props b/dep/winpixeventruntime/WinPixEventRuntime.props similarity index 95% rename from dep/msvc/winpixeventruntime/WinPixEventRuntime.props rename to dep/winpixeventruntime/WinPixEventRuntime.props index caea8f719..59c8acd6f 100644 --- a/dep/msvc/winpixeventruntime/WinPixEventRuntime.props +++ b/dep/winpixeventruntime/WinPixEventRuntime.props @@ -2,7 +2,7 @@ $(SolutionDir)bin\$(Platform)\ - $(SolutionDir)dep\msvc\winpixeventruntime\ + $(SolutionDir)dep\winpixeventruntime\ diff --git a/dep/msvc/winpixeventruntime/bin64/WinPixEventRuntime.dll b/dep/winpixeventruntime/bin64/WinPixEventRuntime.dll similarity index 100% rename from dep/msvc/winpixeventruntime/bin64/WinPixEventRuntime.dll rename to dep/winpixeventruntime/bin64/WinPixEventRuntime.dll diff --git a/dep/msvc/winpixeventruntime/binarm64/WinPixEventRuntime.dll b/dep/winpixeventruntime/binarm64/WinPixEventRuntime.dll similarity index 100% rename from dep/msvc/winpixeventruntime/binarm64/WinPixEventRuntime.dll rename to dep/winpixeventruntime/binarm64/WinPixEventRuntime.dll diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h b/dep/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h similarity index 100% rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h rename to dep/winpixeventruntime/include/WinPixEventRuntime/PIXEvents.h diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h b/dep/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h similarity index 100% rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h rename to dep/winpixeventruntime/include/WinPixEventRuntime/PIXEventsCommon.h diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3.h b/dep/winpixeventruntime/include/WinPixEventRuntime/pix3.h similarity index 100% rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3.h rename to dep/winpixeventruntime/include/WinPixEventRuntime/pix3.h diff --git a/dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h b/dep/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h similarity index 100% rename from dep/msvc/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h rename to dep/winpixeventruntime/include/WinPixEventRuntime/pix3_win.h diff --git a/dep/msvc/winpixeventruntime/lib64/WinPixEventRuntime.lib b/dep/winpixeventruntime/lib64/WinPixEventRuntime.lib similarity index 100% rename from dep/msvc/winpixeventruntime/lib64/WinPixEventRuntime.lib rename to dep/winpixeventruntime/lib64/WinPixEventRuntime.lib diff --git a/dep/msvc/winpixeventruntime/libarm64/WinPixEventRuntime.lib b/dep/winpixeventruntime/libarm64/WinPixEventRuntime.lib similarity index 100% rename from dep/msvc/winpixeventruntime/libarm64/WinPixEventRuntime.lib rename to dep/winpixeventruntime/libarm64/WinPixEventRuntime.lib diff --git a/src/util/util.props b/src/util/util.props index eb902332f..35d993262 100644 --- a/src/util/util.props +++ b/src/util/util.props @@ -21,5 +21,5 @@ - +