Minor tweaks to cmake files

7 files changed, 26 insertions, 39 deletions

diff --git a/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in
index 00ad6670..00ad6670 100644
--- a/CTestCustom.cmake.in
+++ b/CMake/CTestCustom.cmake.in
diff --git a/CMake/Free_CMakeImport.cmake b/CMake/Free_CMakeImport.cmake
new file mode 100644
index 00000000..e61de263
--- /dev/null
+++ b/CMake/Free_CMakeImport.cmake
@@ -0,0 +1,3 @@
+SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake")
+FIND_PACKAGE(FreeImage REQUIRED)
+ADD_DEFINITIONS ( -DFREEIMAGE_LIB )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21efea9e..6c33131b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CTestCustom.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake
   @ONLY
   )
@@ -88,13 +88,12 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/opj_configure.h.in
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
-  codec
-  test_V2_tile_handling
-  test_Free_image_V2_tile_handling
   # mj2
-  # cmake 2.4.5 has poor java support
   #j2kviewer/src
   )
+IF(BUILD_EXAMPLES)
+  SUBDIRS(codec)
+ENDIF(BUILD_EXAMPLES)
 
 #IF(NOT UNIX)
 #SUBDIRS(
@@ -105,12 +104,6 @@ SUBDIRS(
 #ENDIF(NOT UNIX)
 
 #-----------------------------------------------------------------------------
-# Build example only if requested
-#IF(BUILD_EXAMPLES)
-#  SUBDIRS(codec)
-#ENDIF(BUILD_EXAMPLES)
-
-#-----------------------------------------------------------------------------
 # For the documentation
 OPTION(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
 IF(BUILD_DOCUMENTATION)
@@ -119,15 +112,18 @@ ENDIF(BUILD_DOCUMENTATION)
 
 #-----------------------------------------------------------------------------
 # For openjpeg team if they ever want Dart+CMake
-IF(OPENJPEG_STANDALONE)
+OPTION(BUILD_TESTING "Build the tests." OFF)
+IF(BUILD_TESTING)
+  ENABLE_TESTING()
   INCLUDE(CTest)
-  #MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
-  IF(BUILD_TESTING)
-    ENABLE_TESTING()
-    SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
-    MARK_AS_ADVANCED(BUILDNAME)
-  ENDIF(BUILD_TESTING)
-ENDIF(OPENJPEG_STANDALONE)
+ENDIF(BUILD_TESTING)
+
+IF(BUILD_TESTING)
+  SUBDIRS(
+    test_V2_tile_handling
+    test_Free_image_V2_tile_handling
+  )
+ENDIF(BUILD_TESTING)
 
 # Adding test with dataset from:
 # http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
diff --git a/ChangeLog b/ChangeLog
index d20af7e2..a6adee90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+Jun 21, 2010
+* [MM] Move CMake files to CMake folder
+* [MM] Remove some warnings in code
+
 April 8, 2010
 * [FOD] Fixed problem with Borland C++ Builder (Borland C do not have lrintf). Thanks Marek Mauder for this fix.
 * [FOD] Fixed pi.c bug (issue 15 on google code). Thanks to Anton Lionel for catching this.
diff --git a/Free_CMakeImport.cmake b/Free_CMakeImport.cmake
deleted file mode 100644
index c0bc03f5..00000000
--- a/Free_CMakeImport.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Import library
-#________________
-	
-	# MESSAGE(STATUS "IMPORT : FreeImagelibrary")
-
-	# Include directories
-	INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage)
-	
-	# Link libraries
-	
-IF(WIN32)
-	LINK_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage)
-	LINK_LIBRARIES(freeimage.s)
-ELSE(WIN32)
-  LINK_LIBRARIES(freeimage)
-ENDIF(WIN32)
-
-	ADD_DEFINITIONS ( -DFREEIMAGE_LIB )
diff --git a/codec/convert.c b/codec/convert.c
index 7e747611..51c8160f 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -1260,7 +1260,8 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) {
 
 int imagetopnm(opj_image_t * image, const char *outfile) {
 	int w, wr, h, hr, max;
-	int i, compno;
+	int i;
+  unsigned int compno;
 	int adjustR, adjustG, adjustB, adjustX;
 	FILE *fdest = NULL;
 	char S2;
diff --git a/test_Free_image_V2_tile_handling/CMakeLists.txt b/test_Free_image_V2_tile_handling/CMakeLists.txt
index 426271f9..3b589a30 100644
--- a/test_Free_image_V2_tile_handling/CMakeLists.txt
+++ b/test_Free_image_V2_tile_handling/CMakeLists.txt
@@ -16,13 +16,14 @@ IF(NOT BUILD_SHARED_LIBS)
   ADD_DEFINITIONS(-DOPJ_STATIC)
 ENDIF(NOT BUILD_SHARED_LIBS)
 
-INCLUDE(${OPENJPEG_SOURCE_DIR}/Free_CMakeImport.cmake)
+INCLUDE(${OPENJPEG_SOURCE_DIR}/CMake/Free_CMakeImport.cmake)
 
 # Loop over all executables:
 FOREACH(exe test2_encoder test2_decoder)
   
   ADD_EXECUTABLE(${exe} ${exe}.c)
   TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg)
+  TARGET_LINK_LIBRARIES(${exe} ${FREEIMAGE_LIBRARIES})
   # Install exe
   INSTALL_TARGETS(/bin/ ${exe})
 ENDFOREACH(exe)