From 12d202099e906b77a4f852328f55fb90d08ef450 Mon Sep 17 00:00:00 2001 From: Curtis J Bezault Date: Mon, 3 Jun 2019 16:42:09 -0700 Subject: [ffmpeg] Fix regression on windows (#6743) * Correctly set environment variables for gcc/clang/icc * refactor out some if statements * Assume windows * Make windows check consistent --- ports/ffmpeg/portfile.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index f2d0e5f93..af67764e6 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -25,16 +25,13 @@ endif() vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR (NOT VCPKG_CMAKE_SYSTEM_NAME)) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(SEP ";") -else() - set(SEP ":") -endif() - -if($CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + #We're assuming that if we're building for Windows we're using MSVC set(INCLUDE_VAR "INCLUDE") set(LIB_PATH_VAR "LIB") else() + set(SEP ":") set(INCLUDE_VAR "CPATH") set(LIB_PATH_VAR "LIBRARY_PATH") endif() -- cgit v1.2.3