File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -85,14 +85,19 @@ set(CONFIG_EXPR
85
85
$< $< CONFIG:Static> :Release> $< $< NOT:$< CONFIG:Static> > :$< CONFIG> >
86
86
)
87
87
88
+ set (set_arch )
89
+ if (CMAKE_GENERATOR_PLATFORM )
90
+ set (set_arch -A ${CMAKE_GENERATOR_PLATFORM} )
91
+ endif ()
92
+
88
93
set (set_toolset )
89
94
if (CMAKE_GENERATOR_TOOLSET )
90
95
set (set_toolset -T ${CMAKE_GENERATOR_TOOLSET} )
91
96
endif ()
92
97
93
98
if (NOT EXISTS "${PB_BINARY_DIR} /exports.cmake" )
94
99
95
- message ("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} " )
100
+ message ("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset} " )
96
101
97
102
file (REMOVE "${PB_BINARY_DIR} /CMakeCache.txt" )
98
103
file (MAKE_DIRECTORY "${PB_BINARY_DIR} " )
@@ -106,7 +111,8 @@ if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
106
111
execute_process (
107
112
COMMAND ${CMAKE_COMMAND}
108
113
-G "${CMAKE_GENERATOR} "
109
- ${set_toolset}
114
+ ${set_arch}
115
+ ${set_toolset}
110
116
${set_build_type}
111
117
-DSTATIC_MSVCRT=${STATIC_MSVCRT}
112
118
-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
You can’t perform that action at this time.
0 commit comments