Demos (master): cmake: Don't use pkg-config when targetting Windows.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Nov 15 17:53:06 UTC 2012


Module: Demos
Branch: master
Commit: f1475da0f0e0669f02de9e9f32724cff66e845b9
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=f1475da0f0e0669f02de9e9f32724cff66e845b9

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Nov 15 17:52:20 2012 +0000

cmake: Don't use pkg-config when targetting Windows.

Fixes MinGW cross-compilation on hosts that have pkg-config.

---

 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9ca83f..484eea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ find_path (GLEW_INCLUDE_DIR GL/glew.h
       /usr/include/GL
 )
 
-if (PKG_CONFIG_FOUND)
+if (PKG_CONFIG_FOUND AND NOT WIN32)
 	pkg_check_modules (GLEW REQUIRED glew>=1.5.4)
 	pkg_check_modules (EGL egl)
 	pkg_check_modules (GLESV1 glesv1_cm)




More information about the mesa-commit mailing list