From 1eefc65631a75954378dae7e50a1254eb5bff205 Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Fri, 8 Sep 2023 15:13:11 +0200 Subject: [PATCH] [devtools] Add Windows manifest enabling `longPathAware` --- tools/buildmgr/cbuildgen/CMakeLists.txt | 1 + tools/buildmgr/cbuildgen/src/cbuildgen.manifest | 8 ++++++++ tools/packchk/CMakeLists.txt | 4 ++++ tools/packchk/src/packchk.manifest | 8 ++++++++ tools/packgen/CMakeLists.txt | 5 +++++ tools/packgen/src/packgen.manifest | 8 ++++++++ tools/projmgr/CMakeLists.txt | 3 +++ tools/projmgr/src/csolution.manifest | 8 ++++++++ tools/svdconv/SVDConv/CMakeLists.txt | 4 ++++ tools/svdconv/SVDConv/src/svdconv.manifest | 8 ++++++++ 10 files changed, 57 insertions(+) create mode 100644 tools/buildmgr/cbuildgen/src/cbuildgen.manifest create mode 100644 tools/packchk/src/packchk.manifest create mode 100644 tools/packgen/src/packgen.manifest create mode 100644 tools/projmgr/src/csolution.manifest create mode 100644 tools/svdconv/SVDConv/src/svdconv.manifest diff --git a/tools/buildmgr/cbuildgen/CMakeLists.txt b/tools/buildmgr/cbuildgen/CMakeLists.txt index db3856f44..eb8c37cc4 100644 --- a/tools/buildmgr/cbuildgen/CMakeLists.txt +++ b/tools/buildmgr/cbuildgen/CMakeLists.txt @@ -27,6 +27,7 @@ add_executable(cbuildgen ${SOURCE_FILES} ${HEADER_FILES}) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") set(EXT "-${CPU_ARCH}") + target_sources(cbuildgen PRIVATE src/cbuildgen.manifest) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") set(EXT ".lin-${CPU_ARCH}") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") diff --git a/tools/buildmgr/cbuildgen/src/cbuildgen.manifest b/tools/buildmgr/cbuildgen/src/cbuildgen.manifest new file mode 100644 index 000000000..853cade1e --- /dev/null +++ b/tools/buildmgr/cbuildgen/src/cbuildgen.manifest @@ -0,0 +1,8 @@ + + + + + true + + + diff --git a/tools/packchk/CMakeLists.txt b/tools/packchk/CMakeLists.txt index 4b4272e46..531e62fdb 100644 --- a/tools/packchk/CMakeLists.txt +++ b/tools/packchk/CMakeLists.txt @@ -46,6 +46,10 @@ if(MSVC) target_sources(packchk PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/PackChk.rc) endif() +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + target_sources(packchk PRIVATE src/packchk.manifest) +endif() + set_property(TARGET packchk PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/tools/packchk/src/packchk.manifest b/tools/packchk/src/packchk.manifest new file mode 100644 index 000000000..853cade1e --- /dev/null +++ b/tools/packchk/src/packchk.manifest @@ -0,0 +1,8 @@ + + + + + true + + + diff --git a/tools/packgen/CMakeLists.txt b/tools/packgen/CMakeLists.txt index 77d8cd8f6..7a6026214 100644 --- a/tools/packgen/CMakeLists.txt +++ b/tools/packgen/CMakeLists.txt @@ -20,6 +20,11 @@ add_executable(packgen src/PackGenMain.cpp include/PackGen.h) if(MSVC) target_link_options(packgen PUBLIC "$<$:/SAFESEH:NO>") endif(MSVC) + +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + target_sources(packgen PRIVATE src/packgen.manifest) +endif() + set_property(TARGET packgen PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR diff --git a/tools/packgen/src/packgen.manifest b/tools/packgen/src/packgen.manifest new file mode 100644 index 000000000..853cade1e --- /dev/null +++ b/tools/packgen/src/packgen.manifest @@ -0,0 +1,8 @@ + + + + + true + + + diff --git a/tools/projmgr/CMakeLists.txt b/tools/projmgr/CMakeLists.txt index 567f43c82..fe54361fe 100644 --- a/tools/projmgr/CMakeLists.txt +++ b/tools/projmgr/CMakeLists.txt @@ -49,6 +49,9 @@ else() endif() target_link_libraries(projmgr projmgrlib) target_include_directories(projmgr PRIVATE include) + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + target_sources(projmgr PRIVATE src/csolution.manifest) + endif() endif() # projmgr test diff --git a/tools/projmgr/src/csolution.manifest b/tools/projmgr/src/csolution.manifest new file mode 100644 index 000000000..853cade1e --- /dev/null +++ b/tools/projmgr/src/csolution.manifest @@ -0,0 +1,8 @@ + + + + + true + + + diff --git a/tools/svdconv/SVDConv/CMakeLists.txt b/tools/svdconv/SVDConv/CMakeLists.txt index deb6e8f77..3692a963e 100644 --- a/tools/svdconv/SVDConv/CMakeLists.txt +++ b/tools/svdconv/SVDConv/CMakeLists.txt @@ -43,6 +43,10 @@ if(MSVC) target_sources(svdconv PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/SVDConv.rc) endif() +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + target_sources(svdconv PRIVATE src/svdconv.manifest) +endif() + set_property(TARGET svdconv PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/tools/svdconv/SVDConv/src/svdconv.manifest b/tools/svdconv/SVDConv/src/svdconv.manifest new file mode 100644 index 000000000..853cade1e --- /dev/null +++ b/tools/svdconv/SVDConv/src/svdconv.manifest @@ -0,0 +1,8 @@ + + + + + true + + +