18 lines
649 B
Diff
18 lines
649 B
Diff
|
diff -r 8a976a308d77 -r 1bea7874cfec cmake/IgnSetCompilerFlags.cmake
|
||
|
|
--- a/cmake/IgnSetCompilerFlags.cmake
|
||
|
|
+++ b/cmake/IgnSetCompilerFlags.cmake
|
||
|
|
@@ -279,13 +279,6 @@
|
||
|
|
# Don't pull in the Windows min/max macros
|
||
|
|
add_definitions(-DNOMINMAX)
|
||
|
|
|
||
|
|
- if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||
|
|
- # Not needed if a proper cmake generator (-G "...Win64") is passed
|
||
|
|
- # to cmake. Enable as a second measure to work around bug
|
||
|
|
- # http://www.cmake.org/Bug/print_bug_page.php?bug_id=11240
|
||
|
|
- set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64")
|
||
|
|
- endif()
|
||
|
|
-
|
||
|
|
if(USE_IGN_RECOMMENDED_FLAGS)
|
||
|
|
|
||
|
|
# Gy: Prevent errors caused by multiply-defined symbols
|