osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some CMake compiler tests for Win64 

Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7
Reviewed-on: https://code.wireshark.org/review/8909
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
This commit is contained in:
Graham Bloice 2015-06-12 10:58:37 +01:00
parent 905506fd98
commit a57398dacb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -269,7 +269,7 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo")
endif()
if(NOT WIN64)
if(NOT "${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64")
set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/D_BIND_TO_CURRENT_CRT_VERSION=1")
endif()

2
ui/gtk/CMakeLists.txt
View File

@ -175,7 +175,7 @@ if(PORTAUDIO_FOUND)
)
# Portaudio has some size_t > long warnings as a result of using strlen() on x64.
if (WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
if ("${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64")
#set_source_files_properties(${PORTAUDIO_SRC_DIR}/hostapi/wmme/pa_win_wmme.c
# PROPERTIES
# COMPILE_FLAGS "/wd4267"