diff options
| author | João Valverde <j@v6e.pt> | 2021-09-22 13:40:57 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2021-09-22 14:21:20 +0100 |
| commit | c4d5eea33ef6cb7eda8569ceaddaedf22bd7a2ea (patch) | |
| tree | 1d95df522f03c18aa8d9cfef33295148bc0ed203 /CMakeLists.txt | |
| parent | a22aa677ad824a09c1831aff1bad709731e8631e (diff) | |
CMake: Target platform for WIN32 needs to be lower case
Capitalization matters here. We are now accepting this value from the
environment so we need to lower case that string.
Add an extra sanity check and status message for target CPU architecture
to help detect mismatches.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c30976d29..13a967d2e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,16 +94,19 @@ if(WIN32) elseif(CMAKE_GENERATOR MATCHES "Visual Studio") set(WIRESHARK_TARGET_PLATFORM win32) elseif(DEFINED ENV{WIRESHARK_TARGET_PLATFORM}) - set(WIRESHARK_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM}) + string(TOLOWER $ENV{WIRESHARK_TARGET_PLATFORM} _target_platform) + set(WIRESHARK_TARGET_PLATFORM ${_target_platform}) else() - message(WARNING "Assuming \"Win64\" target platform") + message(WARNING "Assuming \"win64\" target platform") set(WIRESHARK_TARGET_PLATFORM win64) endif() if(WIRESHARK_TARGET_PLATFORM MATCHES "win64") set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE amd64) - else() + elseif(WIRESHARK_TARGET_PLATFORM MATCHES "win32") set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE x86) + else() + message(FATAL_ERROR "Invalid target platform: ${WIRESHARK_TARGET_PLATFORM}") endif() # Sanity check @@ -122,7 +125,10 @@ if(WIN32) " doesn't match the generator platform (${WIRESHARK_TARGET_PLATFORM})") endif() endif() - message(STATUS "Building for ${WIRESHARK_TARGET_PLATFORM} using ${CMAKE_GENERATOR}") + message(STATUS + "Building for ${WIRESHARK_TARGET_PLATFORM} using \"${CMAKE_GENERATOR}\" \ +and CPU target architecture \"${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}\"" + ) # Determine where the 3rd party libraries will be if( DEFINED ENV{WIRESHARK_LIB_DIR} ) |