diff --git a/cmake/toolchains/linux.cmake b/cmake/toolchains/linux.cmake index e7455e8..3239620 100644 --- a/cmake/toolchains/linux.cmake +++ b/cmake/toolchains/linux.cmake @@ -7,8 +7,8 @@ if (NOT _VCPKG_LINUX_TOOLCHAIN_OVERRIDE) include(${_VCPKG_ROOT_DIR}/scripts/toolchains/linux.cmake) endif() - string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -g1 -DNDEBUG -O3 ") - string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -g1 -DNDEBUG -O3 ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -g0 -DNDEBUG -O3 ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -g0 -DNDEBUG -O3 ") string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g1 -O1 ") string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g1 -O1 ") diff --git a/cmake/toolchains/osx.cmake b/cmake/toolchains/osx.cmake index c854636..94bafaf 100644 --- a/cmake/toolchains/osx.cmake +++ b/cmake/toolchains/osx.cmake @@ -7,8 +7,8 @@ if (NOT _VCPKG_OSX_TOOLCHAIN_OVERRIDE) include(${_VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake) endif() - string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -gline-tables-only -DNDEBUG -O3 ") - string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -gline-tables-only -DNDEBUG -O3 ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -g0 -DNDEBUG -O3 ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -g0 -DNDEBUG -O3 ") string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -gline-tables-only -O1 ") string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -gline-tables-only -O1 ") diff --git a/cmake/toolchains/windows.cmake b/cmake/toolchains/windows.cmake index 2a7cd06..96726f4 100644 --- a/cmake/toolchains/windows.cmake +++ b/cmake/toolchains/windows.cmake @@ -3,6 +3,9 @@ if (NOT _VCPKG_WINDOWS_TOOLCHAIN_OVERRIDE) include($ENV{VCPKG_ROOT}/scripts/toolchains/windows.cmake) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Zc:inline") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:inline") + string(REPLACE "/Z7" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") string(REPLACE "/Z7" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") @@ -17,8 +20,8 @@ if (NOT _VCPKG_WINDOWS_TOOLCHAIN_OVERRIDE) string(REPLACE "/MP" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REPLACE "/MP" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REPLACE "/Z7" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") - string(REPLACE "/Z7" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "/Z7" "-gline-tables-only" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "/Z7" "-gline-tables-only" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") diff --git a/cmake/triplets/x64-windows-static-md.cmake b/cmake/triplets/x64-windows-static-md.cmake index cd638df..d915145 100644 --- a/cmake/triplets/x64-windows-static-md.cmake +++ b/cmake/triplets/x64-windows-static-md.cmake @@ -2,14 +2,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_C_FLAGS "-Zc:inline") - -if (DEFINED ENV{LLVM_DIR}) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -gline-tables-only") -endif () - -set(VCPKG_CXX_FLAGS ${VCPKG_C_FLAGS}) - set(VCPKG_ENV_PASSTHROUGH_UNTRACKED "VCPKG_ROOT;LLVM_DIR") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/windows.cmake) diff --git a/cmake/triplets/x64-windows-static.cmake b/cmake/triplets/x64-windows-static.cmake index f1b6ebe..72f8054 100644 --- a/cmake/triplets/x64-windows-static.cmake +++ b/cmake/triplets/x64-windows-static.cmake @@ -2,14 +2,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_C_FLAGS "-Zc:inline") - -if (DEFINED ENV{LLVM_DIR}) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -gline-tables-only") -endif () - -set(VCPKG_CXX_FLAGS ${VCPKG_C_FLAGS}) - set(VCPKG_ENV_PASSTHROUGH_UNTRACKED "VCPKG_ROOT;LLVM_DIR") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/windows.cmake) diff --git a/cmake/triplets/x86-windows-static-md.cmake b/cmake/triplets/x86-windows-static-md.cmake index 84e2f4f..434a0b7 100644 --- a/cmake/triplets/x86-windows-static-md.cmake +++ b/cmake/triplets/x86-windows-static-md.cmake @@ -2,14 +2,6 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_C_FLAGS "-Zc:inline") - -if (DEFINED ENV{LLVM_DIR}) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -gline-tables-only") -endif () - -set(VCPKG_CXX_FLAGS ${VCPKG_C_FLAGS}) - set(VCPKG_ENV_PASSTHROUGH_UNTRACKED "VCPKG_ROOT;LLVM_DIR") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/windows.cmake) diff --git a/cmake/triplets/x86-windows-static.cmake b/cmake/triplets/x86-windows-static.cmake index 31d77d2..c45b6de 100644 --- a/cmake/triplets/x86-windows-static.cmake +++ b/cmake/triplets/x86-windows-static.cmake @@ -2,14 +2,6 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_C_FLAGS "-Zc:inline") - -if (DEFINED ENV{LLVM_DIR}) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -gline-tables-only") -endif () - -set(VCPKG_CXX_FLAGS ${VCPKG_C_FLAGS}) - set(VCPKG_ENV_PASSTHROUGH_UNTRACKED "VCPKG_ROOT;LLVM_DIR") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/windows.cmake)