Skip to content

Fix static CRT compilation #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alovchin91 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix static CRT compilation #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project(msix-sdk)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

Expand Down
8 changes: 1 addition & 7 deletions cmake/msix_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,7 @@ if(USE_STATIC_MSVC)
if(NOT WIN32)
message(FATAL_ERROR "-DUSE_STATIC_MSVC=on can only be used for Windows")
endif()
# By default these flags have /MD set. Modified it to use /MT instead.
foreach(buildType RELEASE MINSIZEREL RELWITHDEBINFO)
set(cxxFlag "CMAKE_CXX_FLAGS_${buildType}")
string(REPLACE "/MD" "/MT" ${cxxFlag} "${${cxxFlag}}")
endforeach()
set(cxxFlagDebug "CMAKE_CXX_FLAGS_DEBUG")
string(REPLACE "/MDd" "/MTd" ${cxxFlagDebug} "${${cxxFlagDebug}}")
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()

# Set xml parser if not set
Expand Down
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MSIX\lib
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.
cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

add_custom_target(LIBS)

Expand Down
2 changes: 1 addition & 1 deletion lib/xerces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# Run "cmake" to generate the build files for your platform

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

# Use new variable expansion policy.
if (POLICY CMP0053)
Expand Down
2 changes: 1 addition & 1 deletion sample/BundleSample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (BundleSample)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion sample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

# For windows copy the library to the msix and samples directory
if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion sample/ExtractContentsSample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (ExtractContentsSample)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion sample/OverrideLanguageSample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (OverrideLanguageSample)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion sample/OverrideStreamSample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (OverrideStreamSample)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion sample/PackSample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2019 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (PackSample)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

add_subdirectory(msix)
add_subdirectory(makemsix)
Expand Down
2 changes: 1 addition & 1 deletion src/makemsix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (makemsix)

if(MSIX_PACK)
Expand Down
9 changes: 1 addition & 8 deletions src/msix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

project(msix)

Expand Down Expand Up @@ -271,13 +271,6 @@ if(WIN32)
string(REPLACE ";" " " DELAYFLAGS "${DELAYFLAGS}")
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "${DELAYFLAGS} /LTCG")
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/windowsexports.def")
if(USE_STATIC_MSVC)
if(CMAKE_BUILD_TYPE MATCHES Debug)
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /NODEFAULTLIB:MSVCRTD")
else()
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /NODEFAULTLIB:MSVCRT")
endif()
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE bcrypt crypt32 wintrust runtimeobject.lib delayimp.lib)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

set(MSIX_TEST_OUTPUT_DIRECTORY "${MSIX_BINARY_ROOT}/msixtest")

Expand Down
2 changes: 1 addition & 1 deletion src/test/mobile/AndroidBVT/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (C) 2017 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)

include_directories(
${include_directories}
Expand Down
2 changes: 1 addition & 1 deletion src/test/msixtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2019 Microsoft. All rights reserved.
# See LICENSE file in the project root for full license information.

cmake_minimum_required(VERSION 3.29.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.28.0 FATAL_ERROR)
project (msixtest)

if(WIN32)
Expand Down