-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #169 from Ghabry/vcpkg-update
Vcpkg library update
- Loading branch information
Showing
17 changed files
with
324 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| if(NOT _VCPKG_WINDOWS_TOOLCHAIN) | ||
| set(_VCPKG_WINDOWS_TOOLCHAIN 1) | ||
| set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "") | ||
| set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "") | ||
|
|
||
| set(CMAKE_SYSTEM_NAME Windows CACHE STRING "") | ||
|
|
||
| if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") | ||
| set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") | ||
| elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") | ||
| set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") | ||
| elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") | ||
| set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") | ||
| elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") | ||
| set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") | ||
| endif() | ||
|
|
||
| if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) | ||
| set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) | ||
| endif() | ||
|
|
||
| if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") | ||
| if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) | ||
| set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") | ||
| elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") | ||
| # any of the four platforms can run x86 binaries | ||
| set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") | ||
| elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") | ||
| # arm64 can run binaries of any of the four platforms after Windows 11 | ||
| set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") | ||
| endif() | ||
|
|
||
| if(NOT DEFINED CMAKE_SYSTEM_VERSION) | ||
| set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") | ||
| endif() | ||
| endif() | ||
|
|
||
| get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) | ||
| if(NOT _CMAKE_IN_TRY_COMPILE) | ||
|
|
||
| if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") | ||
| set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") | ||
| elseif(VCPKG_CRT_LINKAGE STREQUAL "static") | ||
| set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") | ||
| else() | ||
| message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") | ||
| endif() | ||
|
|
||
| set(CHARSET_FLAG "/utf-8") | ||
| if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") | ||
| # VS 2013 does not support /utf-8 | ||
| set(CHARSET_FLAG) | ||
| endif() | ||
|
|
||
| set(MP_BUILD_FLAG "") | ||
| if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) | ||
| set(MP_BUILD_FLAG "/MP") | ||
| endif() | ||
|
|
||
| set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc ${MP_BUILD_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "") | ||
| set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} ${MP_BUILD_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "") | ||
|
|
||
| if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64ec") | ||
| string(APPEND CMAKE_CXX_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC") | ||
| string(APPEND CMAKE_C_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC") | ||
| endif() | ||
| set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "") | ||
|
|
||
| unset(CHARSET_FLAG) | ||
|
|
||
| set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /O2 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") | ||
| set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /O2 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") | ||
| set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") | ||
| set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") | ||
|
|
||
| string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") | ||
| set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") | ||
| set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") | ||
| set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") | ||
|
|
||
| string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") | ||
| string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") | ||
| string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") | ||
| string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") | ||
| endif() | ||
| endif() |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/source/config/mh-darwin b/source/config/mh-darwin | ||
| index 7b15709..e2cdbdb 100644 | ||
| --- a/source/config/mh-darwin | ||
| +++ b/source/config/mh-darwin | ||
| @@ -31,7 +31,8 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) | ||
|
|
||
| ## Compiler switches to embed a library name and version information | ||
| ifeq ($(ENABLE_RPATH),YES) | ||
| -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) | ||
| +ID_PREFIX = @rpath | ||
| +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(ID_PREFIX)/$(notdir $(MIDDLE_SO_TARGET)) | ||
| else | ||
| LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) | ||
| endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.