Merge remote branch 'origin/master'

brownman · Aug 26, 2010 · 8ce9ed5 · 8ce9ed5
2 parents 49c715f + b6fa277
commit 8ce9ed5
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,12 +2,14 @@ project(VGL)
 cmake_minimum_required(VERSION 2.6)
 
 # External libraries that we use.
-include(FindGLUT)
-include(FindJPEG)
-include(FindPNG)
-include(FindOpenGL)
-include(FindOpenMP)
-include(FindTIFF)
+find_package(GLUT)
+find_package(JPEG)
+find_package(PNG)
+find_package(OpenGL)
+find_package(OpenMP)
+find_package(TIFF)
+
+add_definitions(${PNG_DEFINITIONS})
 
 # There's no ready-made CMake module for setting up cppunit, so it's DIY time...
 find_library(CPPUNIT_LIBRARY cppunit)