File tree 2 files changed +11
-11
lines changed
2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -195,7 +195,7 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
195
195
set (MARCH_FLAG CACHE STRING "CPU optimization (use i686 for generic optimization)" )
196
196
else (CMAKE_SIZEOF_VOID_P EQUAL 8)
197
197
message (STATUS "Building Spring for 32bit environment" )
198
- set (MARCH_FLAG ${I686_FLAG } CACHE STRING "CPU optimization (use i686 for generic optimization)" )
198
+ set (MARCH_FLAG ${MARCH } CACHE STRING "CPU optimization (use i686 for generic optimization)" )
199
199
endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
200
200
201
201
if ($ENV{CXX} MATCHES "icpc" )
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ If (NOT DEFINED VISIBILITY_HIDDEN)
26
26
EndIf (HAS_VISIBILITY_HIDDEN)
27
27
EndIf (NOT MINGW AND NOT APPLE )
28
28
EndIf (NOT DEFINED VISIBILITY_HIDDEN)
29
-
29
+
30
30
31
31
If (NOT DEFINED VISIBILITY_INLINES_HIDDEN)
32
32
Set (VISIBILITY_INLINES_HIDDEN "" )
@@ -87,13 +87,13 @@ If (NOT DEFINED LTO_FLAGS)
87
87
EndIf (LTO AND LTO_WHOPR)
88
88
EndIf (NOT DEFINED LTO_FLAGS)
89
89
90
- IF (NOT DEFINED I686_FLAG)
91
- CHECK_CXX_ACCEPTS_FLAG("-march i686" HAS_I686_FLAG)
92
- IF (HAS_I686_FLAG)
93
- Set (HAS_I686_FLAG "-march i686" )
94
- Else (HAS_I686_FLAG)
95
- Message (INFO "-march i686 flag not accepted" )
96
- Set (I686_FLAG "" )
97
- EndIf (HAS_I686_FLAG)
98
- EndIf (NOT DEFINED I686_FLAG)
99
90
91
+ IF (NOT DEFINED MARCH)
92
+ CHECK_CXX_ACCEPTS_FLAG("-march=i686" HAS_I686_FLAG_)
93
+ IF (HAS_I686_FLAG_)
94
+ Set (MARCH "i686" )
95
+ Else (HAS_I686_FLAG_)
96
+ Message (INFO "-march=i686 flag not accepted" )
97
+ Set (MARCH "" )
98
+ EndIf (HAS_I686_FLAG_)
99
+ EndIf (NOT DEFINED MARCH)
You can’t perform that action at this time.
0 commit comments