diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-09 13:53:17 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-09 22:21:41 +0000 |
| commit | 8bd80e0191abbfd896417f180e89316e380bc830 (patch) | |
| tree | 7d4e817f14d60e3e12124a1de7c1c8e529c4ac6f /cmake | |
| parent | a81f0d1b38e86c6b4c464b49a4168924e9216df9 (diff) | |
CMake: Set WIRESHARK_TARGET_PLATFORM.
Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used
by a couple of our modules and will be used for NSIS packaging.
Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
Reviewed-on: https://code.wireshark.org/review/6458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindWSWinLibs.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index fe4018f094..d75843e275 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -11,7 +11,7 @@ FindWSWinLibs( "WpdPack" "PCAP_HINTS" ) # The 64-bit wpcap.lib is under /x64 set ( _PLATFORM_SUBDIR "" ) -if( WIN32 AND "$ENV{WIRESHARK_TARGET_PLATFORM}" MATCHES "64" ) +if( WIN32 AND "${WIRESHARK_TARGET_PLATFORM}" STREQUAL "win64" ) set ( _PLATFORM_SUBDIR "/x64" ) endif() diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake index 828cb8b63d..ddf2980830 100644 --- a/cmake/modules/FindWSWinLibs.cmake +++ b/cmake/modules/FindWSWinLibs.cmake @@ -16,8 +16,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR ) file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR ) else() file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR ) - set( _WS_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM} ) - set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${_WS_TARGET_PLATFORM}-libs" ) + set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" ) endif() endif() file( GLOB _SUBDIR "${_PROJECT_LIB_DIR}/*" ) |