Skip to content

Commit 08dc9a1

Browse files
Changming Sunguschmue
Changming Sun
authored and
guschmue
committed
Update the compile flags for vcpkg packages (#23455)
### Description This PR updates the triplets files that manage the compile flags for vcpkg packages. All the changes are autogenerated except for the gen.py file in this PR. Main changes: 1. Enable debug info for all Linux build config(Release and Debug) 2. Set CMAKE_CXX_STANDARD in each triplet. The value is set to 20 for macOS targets and 17 for the others. 3. Only set _FORTIFY_SOURCE in release build. This is to address a build issue on some platforms with the following glibc change: "Warn if user requests __FORTIFY_SOURCE but it is disabled" https://sourceware.org/git/?p=glibc.git;a=commit;f=include/features.h;h=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc ### Motivation and Context Address a Linux build error.
1 parent 8eaafa8 commit 08dc9a1

File tree

79 files changed

+255
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+255
-131
lines changed

‎cmake/vcpkg-triplets/asan/arm64-linux.cmake‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
set(VCPKG_TARGET_ARCHITECTURE arm64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
6-
set(VCPKG_C_FLAGS "-fsanitize=address")
7-
set(VCPKG_CXX_FLAGS "-fsanitize=address")
6+
set(VCPKG_C_FLAGS "-g -fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-g -fsanitize=address")
8+
set(VCPKG_C_FLAGS_RELEASE "-DNDEBUG -O3")
9+
set(VCPKG_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
810
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
911
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1012
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
11-
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
13+
set(VCPKG_LINKER_FLAGS "-fsanitize=address -g")
14+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_CXX_STANDARD=17)
1215
if(PORT MATCHES "onnx")
1316
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1417
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/arm64-osx.cmake‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
set(VCPKG_TARGET_ARCHITECTURE arm64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
6-
set(VCPKG_C_FLAGS "-fsanitize=address")
7-
set(VCPKG_CXX_FLAGS "-fsanitize=address")
6+
set(VCPKG_C_FLAGS "-g -fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-g -fsanitize=address")
8+
set(VCPKG_C_FLAGS_RELEASE "-DNDEBUG -O3")
9+
set(VCPKG_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
810
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
911
set(VCPKG_OSX_ARCHITECTURES "arm64")
1012
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1113
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
12-
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
14+
set(VCPKG_LINKER_FLAGS "-fsanitize=address -g")
15+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_CXX_STANDARD=20)
1316
if(PORT MATCHES "onnx")
1417
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1518
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/arm64-windows-static-md.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
66
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
77
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8-
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DCMAKE_CXX_STANDARD=17)
99
if(PORT MATCHES "onnx")
1010
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1111
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/arm64-windows-static.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE static)
55
set(VCPKG_LIBRARY_LINKAGE static)
66
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
77
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8-
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DCMAKE_CXX_STANDARD=17)
99
if(PORT MATCHES "onnx")
1010
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1111
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/arm64ec-windows-static-md.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
66
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
77
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8-
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DCMAKE_CXX_STANDARD=17)
99
if(PORT MATCHES "onnx")
1010
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1111
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/arm64ec-windows-static.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE static)
55
set(VCPKG_LIBRARY_LINKAGE static)
66
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
77
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8-
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DCMAKE_CXX_STANDARD=17)
99
if(PORT MATCHES "onnx")
1010
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1111
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/universal2-osx.cmake‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
set(VCPKG_TARGET_ARCHITECTURE x64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
6-
set(VCPKG_C_FLAGS "-fsanitize=address")
7-
set(VCPKG_CXX_FLAGS "-fsanitize=address")
6+
set(VCPKG_C_FLAGS "-g -fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-g -fsanitize=address")
8+
set(VCPKG_C_FLAGS_RELEASE "-DNDEBUG -O3")
9+
set(VCPKG_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
810
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
911
set(VCPKG_OSX_ARCHITECTURES "x86_64;arm64")
1012
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1113
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
12-
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
14+
set(VCPKG_LINKER_FLAGS "-fsanitize=address -g")
15+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_CXX_STANDARD=20)
1316
if(PORT MATCHES "onnx")
1417
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1518
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/x64-linux.cmake‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
set(VCPKG_TARGET_ARCHITECTURE x64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
6-
set(VCPKG_C_FLAGS "-fsanitize=address")
7-
set(VCPKG_CXX_FLAGS "-fsanitize=address")
6+
set(VCPKG_C_FLAGS "-g -fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-g -fsanitize=address")
8+
set(VCPKG_C_FLAGS_RELEASE "-DNDEBUG -O3")
9+
set(VCPKG_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
810
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
911
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1012
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
11-
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
13+
set(VCPKG_LINKER_FLAGS "-fsanitize=address -g")
14+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_CXX_STANDARD=17)
1215
if(PORT MATCHES "onnx")
1316
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1417
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/x64-osx.cmake‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
set(VCPKG_TARGET_ARCHITECTURE x64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
6-
set(VCPKG_C_FLAGS "-fsanitize=address")
7-
set(VCPKG_CXX_FLAGS "-fsanitize=address")
6+
set(VCPKG_C_FLAGS "-g -fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-g -fsanitize=address")
8+
set(VCPKG_C_FLAGS_RELEASE "-DNDEBUG -O3")
9+
set(VCPKG_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
810
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
911
set(VCPKG_OSX_ARCHITECTURES "x86_64")
1012
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1113
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
12-
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
14+
set(VCPKG_LINKER_FLAGS "-fsanitize=address -g")
15+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_CXX_STANDARD=20)
1316
if(PORT MATCHES "onnx")
1417
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1518
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

‎cmake/vcpkg-triplets/asan/x64-windows-static-md.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE static)
66
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
77
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8-
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DCMAKE_CXX_STANDARD=17)
99
if(PORT MATCHES "onnx")
1010
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
1111
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"

0 commit comments

Comments
 (0)