diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e14b1eda..73298b896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,6 @@ endif() set(ENV{PKG_CONFIG_PATH} ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig:/opt/ffmpeg/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}) -set(ENV{PKG_CONFIG_PATH_i686_w64_mingw32_shared} - ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig) -set(ENV{PKG_CONFIG_PATH_x86_64_w64_mingw32_shared} - ${CMAKE_SOURCE_DIR}/libs/lib/pkgconfig) execute_process( COMMAND brew --prefix qt5 diff --git a/windows/toolchain-x86_64-w64-mingw32.cmake b/windows/toolchain-x86_64-w64-mingw32.cmake index d96908729..c0ba10651 100644 --- a/windows/toolchain-x86_64-w64-mingw32.cmake +++ b/windows/toolchain-x86_64-w64-mingw32.cmake @@ -6,9 +6,6 @@ SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) -# here is the target environment located -SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /usr/x86_64-w64-mingw32) - # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment