From a937c91694337a905df6c8d51579d4d4498ec022 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Sun, 11 Mar 2012 13:57:26 +0000 Subject: [PATCH] [v2] do not make freeimage compulsary when not needed. --- CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96664b67..331c124a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,14 +158,18 @@ IF(BUILD_TESTING) ENDIF(BUILD_TESTING) IF(BUILD_TESTING) -SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake") -FIND_PACKAGE(FreeImage REQUIRED) -INCLUDE_DIRECTORIES( ${FREEIMAGE_INCLUDE_PATH} ) + SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake") + FIND_PACKAGE(FreeImage) SUBDIRS( test_V2_tile_handling - test_Free_image_V2_tile_handling - ) + ) + if(FREEIMAGE_FOUND) + INCLUDE_DIRECTORIES( ${FREEIMAGE_INCLUDE_PATH} ) + SUBDIRS( + test_Free_image_V2_tile_handling + ) + endif(FREEIMAGE_FOUND) ENDIF(BUILD_TESTING) # Adding test with dataset from: