From 6723924b5b6cf383f6063c877d8e8f71019af784 Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Mon, 14 Jun 2021 21:15:34 +0100 Subject: [PATCH] Fix map editor and g3d viewer build for linux and macos --- source/g3d_viewer/CMakeLists.txt | 2 +- source/glest_map_editor/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 46ef636a..4699a36b 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -62,7 +62,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) MESSAGE(STATUS " wxWidgets: ${wxWidgets_INCLUDE_DIRS} ;/; ${wxWidgets_LIBRARIES}") ENDIF() - IF(PKG_CONFIG_FOUND) + IF(NOT VS_BUILD) find_package(PkgConfig REQUIRED) ENDIF() IF(FORCE_STREFLOP_SOFTWRAPPER) diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index f1f0b3b1..bf8aaed5 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -82,7 +82,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) ENDIF() ENDIF() - IF(PKG_CONFIG_FOUND) + IF(NOT VS_BUILD) find_package(PkgConfig REQUIRED) ENDIF() IF(FORCE_STREFLOP_SOFTWRAPPER)