From 3d36577a20606e0ece4e74504c78e6a680289cf5 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sun, 5 Jun 2011 21:08:44 +0200 Subject: [PATCH 1/2] Make cmake for fgpanel work under linux --- utils/fgpanel/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/fgpanel/CMakeLists.txt b/utils/fgpanel/CMakeLists.txt index e770d76f1..90dc2f2d9 100644 --- a/utils/fgpanel/CMakeLists.txt +++ b/utils/fgpanel/CMakeLists.txt @@ -1,7 +1,7 @@ -#FIXME: does this work in *nix/windows? -find_package(png REQUIRED) +#FIXME: does this work in windows? +find_package(PNG REQUIRED) find_package(OpenGL REQUIRED) -find_package(glut REQUIRED) +find_package(GLUT REQUIRED) add_executable(fgpanel main.cxx FGGLApplication.cxx From 2d0d434ffa0919e214537a73c599629228cf26e1 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sun, 5 Jun 2011 21:38:44 +0200 Subject: [PATCH 2/2] cmake: check for SimGear 2.3.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06f3517b3..ae3117a14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ if(ENABLE_LIBSVN) endif(ENABLE_LIBSVN) find_package(PLIB REQUIRED puaux pu js fnt) -find_package(SimGear 2.2.0 REQUIRED) +find_package(SimGear 2.3.0 REQUIRED) check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(sys/time.h HAVE_SYS_TIME_H)