Use lowercase for cmake commands consistenly

Inspired from https://github.com/InsightSoftwareConsortium/ITK/blob/master/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt
This needs vim 7.3 and fails with vim 7.4

This also fixes a number of :
- missing empty line at end of files
- useless space at end of lines

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3326b54e5cc24a2c10069f5c146d958dca00938b..6f3753ff4f5e40274b78148c1da5b0e2591f0fd3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ set(PACKAGE_VERSION
 # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
 # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
 if(NOT OPENJPEG_SOVERSION)
-  SET(OPENJPEG_SOVERSION 7)
+  set(OPENJPEG_SOVERSION 7)
 endif(NOT OPENJPEG_SOVERSION)
 set(OPENJPEG_LIBRARY_PROPERTIES
   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
@@ -190,7 +190,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
   # For all builds, make sure openjpeg is std99 compliant:
   # set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
   # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  SET(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
+  set(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
 endif()
 
 #-----------------------------------------------------------------------------
@@ -281,7 +281,7 @@ configure_file(
  ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
  @ONLY
  )
- 
+
  configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h

diff --git a/cmake/EnsureFileInclude.cmake b/cmake/EnsureFileInclude.cmake
index e173ea1a9fbb4567f062865487f46f324e4188e4..a4c064bbecaf0faf45a249096cc897654479ecd2 100644 (file)
--- a/cmake/EnsureFileInclude.cmake
+++ b/cmake/EnsureFileInclude.cmake
@@ -1,5 +1,5 @@
 # Ensure that an include file is provided by the system
-# Add the check about the mandatory status to the check_include_file macro 
+# Add the check about the mandatory status to the check_include_file macro
 # provided by cmake
 
 include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
@@ -23,4 +23,4 @@ if (NOT ${${VARIABLE_NAME}})
   endif()
 endif()
 
-endmacro()
\ No newline at end of file
+endmacro()

diff --git a/doc/Doxyfile.dox.cmake.in b/doc/Doxyfile.dox.cmake.in
index 8c2398ee93b9ea15592372058e05eadbaaf4b95f..3163f991f9184fb03abd478c344386cc10d73e5e 100644 (file)
--- a/doc/Doxyfile.dox.cmake.in
+++ b/doc/Doxyfile.dox.cmake.in
@@ -145,7 +145,7 @@ HTML_STYLESHEET        =
 HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = NO 
+HTML_TIMESTAMP         = NO
 HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO

diff --git a/src/bin/common/CMakeLists.txt b/src/bin/common/CMakeLists.txt
index bb07ba7c00106176c67c6d0d56f16676ecbf9e08..017c23df33dc21407c833af79555fef4e8a57ee1 100644 (file)
--- a/src/bin/common/CMakeLists.txt
+++ b/src/bin/common/CMakeLists.txt
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
-# opj_apps_config.h generation 
+# opj_apps_config.h generation
 configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/opj_apps_config.h.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/opj_apps_config.h
  @ONLY
- )
\ No newline at end of file
+ )

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index d583c2e6bb16c9e6b46893d97eeb202369b50d7a..dc013c21735b883842a51248989cdc3751d9a79f 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -13,7 +13,7 @@ set(common_SRCS
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.h
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_string.h
   )
-  
+
 if(OPJ_HAVE_LIBTIFF)
        list(APPEND common_SRCS converttif.c)
 endif()
@@ -64,7 +64,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )
   if(OPJ_USE_DSYMUTIL)
-    add_custom_command(TARGET ${exe} POST_BUILD 
+    add_custom_command(TARGET ${exe} POST_BUILD
     COMMAND "dsymutil" "$<TARGET_FILE:${exe}>"
     COMMENT "dsymutil $<TARGET_FILE:${exe}>"
     DEPENDS ${exe})

diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt
index 5a35a1695d79ba40953343bd5812278be0522961..3cac1a8fa6b9d01bf4de6e12d22361c7c21b2d1f 100644 (file)
--- a/src/bin/jp3d/CMakeLists.txt
+++ b/src/bin/jp3d/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Build the demo app, small examples
 
 # First thing define the common source:
-SET(common_SRCS
+set(common_SRCS
   convert.c
   ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
   )
@@ -26,15 +26,15 @@ if(WIN32)
 endif()
 
 # Loop over all executables:
-FOREACH(exe opj_jp3d_compress opj_jp3d_decompress)
-  ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
-  TARGET_LINK_LIBRARIES(${exe} openjp3d)
+foreach(exe opj_jp3d_compress opj_jp3d_decompress)
+  add_executable(${exe} ${exe}.c ${common_SRCS})
+  target_link_libraries(${exe} openjp3d)
   # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
+  if(UNIX)
+    target_link_libraries(${exe} m)
+  endif(UNIX)
   # Install exe
-  INSTALL(TARGETS ${exe}
+  install(TARGETS ${exe}
     EXPORT OpenJP3DTargets
     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
   )

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index 821b20150bf147b1bd0f0d2881b1c4a0858ca61a..301d885bace0a74916080ffece561aa84ea429ed 100644 (file)
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -60,7 +60,7 @@ endforeach()
 find_package(Java 1.5 COMPONENTS Development) # javac, jar
 
 # User can override this:
-if(NOT DEFINED JAVA_SOURCE_VERSION) 
+if(NOT DEFINED JAVA_SOURCE_VERSION)
   set(JAVA_SOURCE_VERSION 1.5)
 endif()
 if(NOT DEFINED JAVA_TARGET_VERSION)

diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
index 78ad7543ea74bd337b627c715fe00b5f93c5311a..5d3e288b667a7878503b5317d6ecf08643a5a6f7 100644 (file)
--- a/src/bin/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -37,11 +37,11 @@ foreach(exe
     APPEND PROPERTY COMPILE_DEFINITIONS USE_MJ2
   )
   target_link_libraries(${exe} ${LCMS_LIBNAME} openmj2)
-  
+
   if(UNIX)
     target_link_libraries(${exe} m)
   endif()
-  
+
   install(TARGETS ${exe}
        DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
 endforeach()

diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 500e905c48ae9455d7ebf535e01bb1d7e5bc1843..367a7a8d1b869404758f3cd2a48b337ba04cda30 100644 (file)
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -136,7 +136,7 @@ endif()
 
 if(OPJ_USE_DSYMUTIL)
   if(BUILD_SHARED_LIBS)
-    add_custom_command(TARGET ${OPENJPEG_LIBRARY_NAME} POST_BUILD 
+    add_custom_command(TARGET ${OPENJPEG_LIBRARY_NAME} POST_BUILD
     COMMAND "dsymutil" "$<TARGET_SONAME_FILE:${OPENJPEG_LIBRARY_NAME}>"
     COMMENT "dsymutil $<TARGET_SONAME_FILE:${OPENJPEG_LIBRARY_NAME}>"
     DEPENDS ${OPENJPEG_LIBRARY_NAME})

diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
index 0bbafea3ddc8beaddd6b45e74508e1aaaae3e6d4..26bf17888efaf74150094492779237515d4f6588 100644 (file)
--- a/src/lib/openjp3d/CMakeLists.txt
+++ b/src/lib/openjp3d/CMakeLists.txt
@@ -5,9 +5,9 @@ include_directories(
   ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   )
 
-SET(OPENJP3D_LIBRARY_NAME openjp3d)
+set(OPENJP3D_LIBRARY_NAME openjp3d)
 # Defines the source code for the library
-SET(OPENJP3D_SRCS
+set(OPENJP3D_SRCS
 bio.c  cio.c  dwt.c  event.c  jp3d.c  jp3d_lib.c  mct.c  mqc.c  openjp3d.c
 pi.c  raw.c  t1.c  t1_3d.c  t2.c  tcd.c  tgt.c  volume.c
 )
@@ -34,7 +34,7 @@ endif()
 # Install library
 install(TARGETS ${OPENJP3D_LIBRARY_NAME}
   EXPORT OpenJP3DTargets
-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} 
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
   COMPONENT Libraries
 )
 

diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
index dbb7e7ce1519af16037d955289977de1fa94f6f7..2ee1764bdb3181b84457cf8702256bc3ddc64606 100644 (file)
--- a/src/lib/openmj2/CMakeLists.txt
+++ b/src/lib/openmj2/CMakeLists.txt
@@ -53,12 +53,12 @@ endif()
 # Install library
 install(TARGETS ${OPENMJ2_LIBRARY_NAME}
   EXPORT OpenMJ2Targets
-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} 
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
   COMPONENT Libraries
 )
 
 # Install includes files
-#INSTALL(FILES mj2.h
-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} 
+#install(FILES mj2.h
+#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
 #  COMPONENT Headers
 #)

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 40283169fbc057c551031f4d8effe8731179d073..31af7c05d743ba085e2976e8cc036260b0fc700e 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -55,7 +55,7 @@ set(BLACKLIST_JPEG2000_TMP
 # Define a list of file which should be gracefully rejected:
 set(BLACKLIST_JPEG2000
     ${BLACKLIST_JPEG2000_TMP}
-    broken1.jp2 
+    broken1.jp2
     broken2.jp2
     broken3.jp2
     broken4.jp2
@@ -340,7 +340,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
                                  NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref)
 
           endif()
-          
+
           # Test the encoded file is a valid JP2 file
           if (JPYLYZER_EXECUTABLE)
             if (${OUTPUT_FILENAME} MATCHES "\\.jp2$")
@@ -348,13 +348,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
                 COMMAND ${JPYLYZER_EXECUTABLE}
                 ${OUTPUT_FILENAME}
                 )
-              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES 
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES
                 DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
                 PASS_REGULAR_EXPRESSION "<isValidJP2>True</isValidJP2>"
                 )              
             endif()
           endif(JPYLYZER_EXECUTABLE)
-          
+
           # If lossless compression (simple test is 4 arguments), decompress & compare
           list(LENGTH CMD_ARG_LIST_2 ARG_COUNT)
           if (ARG_COUNT EQUAL 4)
@@ -363,13 +363,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
               add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
                 COMMAND opj_decompress -i ${OUTPUT_FILENAME} -o ${OUTPUT_FILENAME}.lossless.tif
                 )
-              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES 
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES
                 DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
                 )
               add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare
                 COMMAND compare_images -b ${INPUT_FILENAME} -t ${OUTPUT_FILENAME}.lossless.tif -n 1 -d
                 )
-              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES 
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES
                 DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
                 )      
             endif()
@@ -401,7 +401,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
           -DOUTFILENAME:STRING=${OUTPUT_FILENAME}
           -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
 
-        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 
+        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5
           PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
         )
 

diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake
index 40e019b73c27bffa1c25c42af4454888c608d683..75afbed05cb9f6c16cac799e9da69a13194a1f01 100644 (file)
--- a/tests/nonregression/checkmd5refs.cmake
+++ b/tests/nonregression/checkmd5refs.cmake
@@ -43,11 +43,11 @@ file(READ ${REFFILE} variable)
 foreach(pgxfullpath ${globfiles})
   file(MD5 ${pgxfullpath} output)
   get_filename_component(pgxfile ${pgxfullpath} NAME)
-  
+
   string(REGEX MATCH "[0-9a-f]+  ${pgxfile}" output_var "${variable}")
 
   set(output "${output}  ${pgxfile}")
-  
+
   if("${output_var}" STREQUAL "${output}")
     message(STATUS "equal: [${output_var}] vs [${output}]")
   else()

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index ae47b88e5ab26da053d05449cf73bba5028e15cb..772b1a30fdc49d6ede3d4782e4a7394e50dcedf9 100644 (file)
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -1,4 +1,4 @@
-# UNIT TESTS 
+# UNIT TESTS
 
 include_directories(
   ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index d1e68ca9f47489e9c9255e3ce3fec92302e3752a..cb24b43b58e22261e6f7e09ad07ba05aac58e4b5 100644 (file)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -2,117 +2,117 @@
 
 #------------
 # Try to find lib Z
-IF(BUILD_THIRDPARTY)
+if(BUILD_THIRDPARTY)
   # Try to build it
   message(STATUS "We will build Z lib from thirdparty")
-  ADD_SUBDIRECTORY(libz)
-  SET(Z_LIBNAME z PARENT_SCOPE)
-  SET(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE)
-  SET(ZLIB_FOUND 1)
-ELSE (BUILD_THIRDPARTY)
+  add_subdirectory(libz)
+  set(Z_LIBNAME z PARENT_SCOPE)
+  set(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE)
+  set(ZLIB_FOUND 1)
+else(BUILD_THIRDPARTY)
   # Try to find lib Z
-  FIND_PACKAGE(ZLIB)
-  IF(ZLIB_FOUND)
-    SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE)
-    SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE)
+  find_package(ZLIB)
+  if(ZLIB_FOUND)
+    set(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE)
+    set(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE)
     message(STATUS "Your system seems to have a Z lib available, we will use it to generate PNG lib")
     # message(STATUS "DEBUG: ${ZLIB_INCLUDE_DIRS} vs ${ZLIB_INCLUDE_DIR}")
-  ELSE (ZLIB_FOUND) # not found
+  else(ZLIB_FOUND) # not found
     message(STATUS "Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)")
-  ENDIF(ZLIB_FOUND)
-ENDIF(BUILD_THIRDPARTY)
+  endif(ZLIB_FOUND)
+endif(BUILD_THIRDPARTY)
 
 
 #------------
 # Try to find lib PNG (which depends on zlib)
-IF(BUILD_THIRDPARTY)
+if(BUILD_THIRDPARTY)
   # Try to build it
   message(STATUS "We will build PNG lib from thirdparty")
-  ADD_SUBDIRECTORY(libpng)
-  SET(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
-  SET(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
-  SET(PNG_LIBNAME png PARENT_SCOPE)
-  SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
-ELSE (BUILD_THIRDPARTY)
-  IF (ZLIB_FOUND)
-    FIND_PACKAGE(PNG)
-    IF(PNG_FOUND)
+  add_subdirectory(libpng)
+  set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
+  set(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
+  set(PNG_LIBNAME png PARENT_SCOPE)
+  set(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
+else(BUILD_THIRDPARTY)
+  if(ZLIB_FOUND)
+    find_package(PNG)
+    if(PNG_FOUND)
       message(STATUS "Your system seems to have a PNG lib available, we will use it")
-      SET(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
-      SET(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
-      SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE)
-      SET(PNG_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE)
-    ELSE(PNG_FOUND) # not found
-      SET(OPJ_HAVE_PNG_H 0 PARENT_SCOPE)
-      SET(OPJ_HAVE_LIBPNG 0 PARENT_SCOPE)
+      set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
+      set(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
+      set(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE)
+      set(PNG_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE)
+    else(PNG_FOUND) # not found
+      set(OPJ_HAVE_PNG_H 0 PARENT_SCOPE)
+      set(OPJ_HAVE_LIBPNG 0 PARENT_SCOPE)
       message(STATUS "PNG lib not found, activate BUILD_THIRDPARTY if you want build it")
-    ENDIF(PNG_FOUND)
-  ENDIF (ZLIB_FOUND)
-ENDIF(BUILD_THIRDPARTY)
+    endif(PNG_FOUND)
+  endif(ZLIB_FOUND)
+endif(BUILD_THIRDPARTY)
 
 #------------
 # Try to find lib TIFF
 
-IF(BUILD_THIRDPARTY)
+if(BUILD_THIRDPARTY)
   # Try to build it
   message(STATUS "We will build TIFF lib from thirdparty")
-  ADD_SUBDIRECTORY(libtiff)
-  SET(TIFF_LIBNAME tiff PARENT_SCOPE)
-  SET(TIFF_INCLUDE_DIRNAME
+  add_subdirectory(libtiff)
+  set(TIFF_LIBNAME tiff PARENT_SCOPE)
+  set(TIFF_INCLUDE_DIRNAME
     ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff
     ${OPENJPEG_BINARY_DIR}/thirdparty/libtiff
     PARENT_SCOPE)
-  SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
-  SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
-ELSE (BUILD_THIRDPARTY)
-  FIND_PACKAGE(TIFF)
-  IF(TIFF_FOUND)
+  set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
+  set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
+else(BUILD_THIRDPARTY)
+  find_package(TIFF)
+  if(TIFF_FOUND)
     message(STATUS "Your system seems to have a TIFF lib available, we will use it")
-    SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
-    SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
-    SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
-    SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
-  ELSE (TIFF_FOUND) # not found
-    SET(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
-    SET(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)
+    set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
+    set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
+    set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
+    set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
+  else(TIFF_FOUND) # not found
+    set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
+    set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)
     message(STATUS "TIFF lib not found, activate BUILD_THIRDPARTY if you want build it")
-  ENDIF(TIFF_FOUND)
-ENDIF(BUILD_THIRDPARTY)
+  endif(TIFF_FOUND)
+endif(BUILD_THIRDPARTY)
 
 #------------
 # Try to find lib LCMS2 (or by default LCMS)
-SET(OPJ_HAVE_LCMS_H 0 PARENT_SCOPE)
-SET(OPJ_HAVE_LIBLCMS 0 PARENT_SCOPE)
+set(OPJ_HAVE_LCMS_H 0 PARENT_SCOPE)
+set(OPJ_HAVE_LIBLCMS 0 PARENT_SCOPE)
 
-IF( BUILD_THIRDPARTY)
+if( BUILD_THIRDPARTY)
   # Try to build lcms2
   message(STATUS "We will build LCMS2 lib from thirdparty")
-  ADD_SUBDIRECTORY(liblcms2)
-  SET(LCMS_LIBNAME lcms2 PARENT_SCOPE)
-  SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) #
-  SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
-  SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
-ELSE (BUILD_THIRDPARTY)
-  FIND_PACKAGE(LCMS2)
-  IF(LCMS2_FOUND)
+  add_subdirectory(liblcms2)
+  set(LCMS_LIBNAME lcms2 PARENT_SCOPE)
+  set(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) #
+  set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+  set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
+else(BUILD_THIRDPARTY)
+  find_package(LCMS2)
+  if(LCMS2_FOUND)
     message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
-    SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
-    SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
-    SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
-    SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
-  ELSE (LCMS2_FOUND) # not found lcms2
+    set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+    set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
+    set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
+    set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
+  else(LCMS2_FOUND) # not found lcms2
     # try to find LCMS
-    FIND_PACKAGE(LCMS)
-    IF(LCMS_FOUND)
+    find_package(LCMS)
+    if(LCMS_FOUND)
       message(STATUS "Your system seems to have a LCMS lib available, we will use it")
-      SET(OPJ_HAVE_LCMS_H 1 PARENT_SCOPE)
-      SET(OPJ_HAVE_LIBLCMS 1 PARENT_SCOPE)
-      SET(LCMS_LIBNAME ${LCMS_LIBRARIES} PARENT_SCOPE)
-      SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE)
-    ELSE (LCMS_FOUND) # not found lcms
-      SET(OPJ_HAVE_LCMS2_H 0 PARENT_SCOPE)
-      SET(OPJ_HAVE_LIBLCMS2 0 PARENT_SCOPE)
+      set(OPJ_HAVE_LCMS_H 1 PARENT_SCOPE)
+      set(OPJ_HAVE_LIBLCMS 1 PARENT_SCOPE)
+      set(LCMS_LIBNAME ${LCMS_LIBRARIES} PARENT_SCOPE)
+      set(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE)
+    else(LCMS_FOUND) # not found lcms
+      set(OPJ_HAVE_LCMS2_H 0 PARENT_SCOPE)
+      set(OPJ_HAVE_LIBLCMS2 0 PARENT_SCOPE)
       message(STATUS "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
-    ENDIF (LCMS_FOUND)
-  ENDIF(LCMS2_FOUND)
-ENDIF(BUILD_THIRDPARTY)
+    endif(LCMS_FOUND)
+  endif(LCMS2_FOUND)
+endif(BUILD_THIRDPARTY)

diff --git a/thirdparty/liblcms2/CMakeLists.txt b/thirdparty/liblcms2/CMakeLists.txt
index e05a42b7f12566935ff428011cda984161979169..debd41b373a962cd69e6a5cd0e13d09e0bedace4 100644 (file)
--- a/thirdparty/liblcms2/CMakeLists.txt
+++ b/thirdparty/liblcms2/CMakeLists.txt
@@ -1,19 +1,19 @@
-PROJECT(liblcms2 C)
+project(liblcms2 C)
 #
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 #
-FILE(GLOB SRCS src/*.c)
-FILE(GLOB HDRS include/*.h)
+file(GLOB SRCS src/*.c)
+file(GLOB HDRS include/*.h)
 #
-SET(LIBTARGET "lcms2")
+set(LIBTARGET "lcms2")
 #
-ADD_LIBRARY(${LIBTARGET} STATIC ${SRCS} ${HDRS})
+add_library(${LIBTARGET} STATIC ${SRCS} ${HDRS})
 #
-IF(MSVC)
-  SET_TARGET_PROPERTIES(${LIBTARGET} PROPERTIES PREFIX "lib")
-ENDIF(MSVC)
+if(MSVC)
+  set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
+endif(MSVC)
 #
-SET_TARGET_PROPERTIES(${LIBTARGET}
+set_target_properties(${LIBTARGET}
   PROPERTIES
   OUTPUT_NAME "${LIBTARGET}"
   ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib)

diff --git a/thirdparty/libpng/CMakeLists.txt b/thirdparty/libpng/CMakeLists.txt
index 0fde4f66ccff658223bdd7c28ce9e4a106799d29..840bd850ab3651af6df1be060282e3a2426b4ef1 100644 (file)
--- a/thirdparty/libpng/CMakeLists.txt
+++ b/thirdparty/libpng/CMakeLists.txt
@@ -1,28 +1,28 @@
-PROJECT(libpng C)
+project(libpng C)
 
-INCLUDE_DIRECTORIES(
+include_directories(
   "${CMAKE_CURRENT_SOURCE_DIR}"
   ${OPENJPEG_SOURCE_DIR}/thirdparty/include
 )
 
-FILE(GLOB SRCS *.c)
-FILE(GLOB HDRS *.h)
-SET(EXT_HDRS
+file(GLOB SRCS *.c)
+file(GLOB HDRS *.h)
+set(EXT_HDRS
  ${OPENJPEG_SOURCE_DIR}/thirdparty/include/zlib.h
  ${OPENJPEG_SOURCE_DIR}/thirdparty/include/zconf.h
 )
 #
-SET(LIBTARGET "png")
+set(LIBTARGET "png")
 #
-ADD_LIBRARY(${LIBTARGET} STATIC ${SRCS} ${HDRS} ${EXT_HDRS})
+add_library(${LIBTARGET} STATIC ${SRCS} ${HDRS} ${EXT_HDRS})
 #
-IF(MSVC)
-  SET_TARGET_PROPERTIES(${LIBTARGET} PROPERTIES PREFIX "lib")
-ENDIF(MSVC)
+if(MSVC)
+  set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
+endif(MSVC)
 #
-TARGET_LINK_LIBRARIES(${LIBTARGET} ${Z_LIBNAME} ${M_LIBRARY})
+target_link_libraries(${LIBTARGET} ${Z_LIBNAME} ${M_LIBRARY})
 #
-SET_TARGET_PROPERTIES(${LIBTARGET}
+set_target_properties(${LIBTARGET}
        PROPERTIES
     OUTPUT_NAME "${LIBTARGET}"
        ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib)

diff --git a/thirdparty/libtiff/CMakeLists.txt b/thirdparty/libtiff/CMakeLists.txt
index 63a8f7e8725c5c16a55d2121d306dd1ce510768a..8a4622638d5e7b44705ccc685e3da3e988f334ba 100644 (file)
--- a/thirdparty/libtiff/CMakeLists.txt
+++ b/thirdparty/libtiff/CMakeLists.txt
@@ -1,12 +1,12 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 project(libtiff C)
 # This convenient copy of libtiff does not support encapsulated zlib or jpeg
 # stream. see ZIP_SUPPORT and JPEG_SUPPORT values
 
-INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}")
-INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
+include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}")
+include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
 
-SET(TARGET_FILES
+set(TARGET_FILES
   t4.h
   tiffiop.h
   tif_aux.c
@@ -53,16 +53,16 @@ SET(TARGET_FILES
   uvcode.h
   )
 
-IF(UNIX)
-  SET(TARGET_FILES ${TARGET_FILES} tif_unix.c)
+if(UNIX)
+  set(TARGET_FILES ${TARGET_FILES} tif_unix.c)
   # Large file support
   # This might not catch every possibility catered for by
   # AC_SYS_LARGEFILE.
   add_definitions(-D_FILE_OFFSET_BITS=64)
   set(_FILE_OFFSET_BITS 64)
-ELSE()
-  SET(TARGET_FILES ${TARGET_FILES} tif_win32.c)
-ENDIF()
+else()
+  set(TARGET_FILES ${TARGET_FILES} tif_win32.c)
+endif()
 
 include(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
@@ -151,7 +151,7 @@ int main(void) {
 }" HAVE_SNPRINTF)
 
 if(NOT HAVE_SNPRINTF)
-  SET(TARGET_FILES ${TARGET_FILES} snprintf.c)
+  set(TARGET_FILES ${TARGET_FILES} snprintf.c)
 endif()
 
 include(CheckTypeSize)
@@ -250,28 +250,28 @@ CHECK_SYMBOL_EXISTS(lfind "search.h" HAVE_LFIND)
 CHECK_SYMBOL_EXISTS(setmod "io.h" HAVE_SETMODE)
 
 # http://www.cmake.org/pipermail/cmake/2007-September/016285.html
-FOREACH(KEYWORD "inline" "__inline__" "__inline")
-  IF(NOT DEFINED C_INLINE)
-    TRY_COMPILE(C_HAS_${KEYWORD} "${CMAKE_CURRENT_BINARY_DIR}"
+foreach(KEYWORD "inline" "__inline__" "__inline")
+  if(NOT DEFINED C_INLINE)
+    try_compile(C_HAS_${KEYWORD} "${CMAKE_CURRENT_BINARY_DIR}"
        "${CMAKE_CURRENT_SOURCE_DIR}/test_inline.c"
        COMPILE_DEFINITIONS "-Dinline=${KEYWORD}")
-    IF(C_HAS_${KEYWORD})
-      SET(C_INLINE TRUE)
-      SET(INLINE_KEYWORD "${KEYWORD}")
-    ENDIF(C_HAS_${KEYWORD})
-  ENDIF(NOT DEFINED C_INLINE)
-ENDFOREACH(KEYWORD)
+    if(C_HAS_${KEYWORD})
+      set(C_INLINE TRUE)
+      set(INLINE_KEYWORD "${KEYWORD}")
+    endif(C_HAS_${KEYWORD})
+  endif(NOT DEFINED C_INLINE)
+endforeach(KEYWORD)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tif_config.h.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h @ONLY)
 
-SET(LIBTARGET "tiff")
+set(LIBTARGET "tiff")
 #
-ADD_LIBRARY(${LIBTARGET} STATIC ${TARGET_FILES})
+add_library(${LIBTARGET} STATIC ${TARGET_FILES})
 #
-SET_TARGET_PROPERTIES(${LIBTARGET}
+set_target_properties(${LIBTARGET}
   PROPERTIES
   OUTPUT_NAME "${LIBTARGET}"
   ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib

diff --git a/thirdparty/libz/CMakeLists.txt b/thirdparty/libz/CMakeLists.txt
index 7cd08180cdd3f94aa0b45302c8469176b7de764c..d257a6b44e388ba810d3e977f921ad54eeec3a4d 100644 (file)
--- a/thirdparty/libz/CMakeLists.txt
+++ b/thirdparty/libz/CMakeLists.txt
@@ -1,14 +1,14 @@
 #based on zlib-1.2.5/CMakeLists.txt
 #
 cmake_minimum_required(VERSION 2.6)
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-PROJECT(zlib C)
+project(zlib C)
 
-INCLUDE(CheckTypeSize)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckIncludeFile)
-INCLUDE(CheckCSourceCompiles)
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
 
 CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE(stdint.h    HAVE_STDINT_H)
@@ -17,47 +17,47 @@ CHECK_INCLUDE_FILE(stddef.h    HAVE_STDDEF_H)
 #
 # Check to see if we have large file support
 #
-SET(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
 # We add these other definitions here because CheckTypeSize.cmake
 # in CMake 2.4.x does not automatically do so and we want
 # compatibility with CMake 2.4.x.
-IF(HAVE_SYS_TYPES_H)
-    LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-ENDIF()
-IF(HAVE_STDINT_H)
-    LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-ENDIF()
-IF(HAVE_STDDEF_H)
-    LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-ENDIF()
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
 CHECK_TYPE_SIZE(off64_t OFF64_T)
-IF(HAVE_OFF64_T)
-   ADD_DEFINITIONS(-D_LARGEFILE64_SOURCE=1)
-ENDIF()
-SET(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
 #
 # Check for fseeko
 #
 CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
-IF(NOT HAVE_FSEEKO)
-    ADD_DEFINITIONS(-DNO_FSEEKO)
-ENDIF()
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
 #
 # Check for unistd.h
 #
 CHECK_INCLUDE_FILE(unistd.h Z_HAVE_UNISTD_H)
 
-INCLUDE_DIRECTORIES(
+include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${OPENJPEG_SOURCE_DIR}/thirdparty/include
 )
 #
-SET(EXT_HDRS
+set(EXT_HDRS
  ${OPENJPEG_SOURCE_DIR}/thirdparty/include/zlib.h
  ${OPENJPEG_SOURCE_DIR}/thirdparty/include/zconf.h
 )
 
-SET(HDRS
+set(HDRS
     crc32.h
     deflate.h
     gzguts.h
@@ -68,7 +68,7 @@ SET(HDRS
     trees.h
     zutil.h
 )
-SET(SRCS
+set(SRCS
     adler32.c
     compress.c
     crc32.c
@@ -86,15 +86,15 @@ SET(SRCS
     zutil.c
 )
 
-SET(LIBTARGET "z")
+set(LIBTARGET "z")
 #
-ADD_LIBRARY(${LIBTARGET} STATIC ${SRCS} ${EXT_HDRS} ${HDRS})
+add_library(${LIBTARGET} STATIC ${SRCS} ${EXT_HDRS} ${HDRS})
 #
-IF(MSVC)
-  SET_TARGET_PROPERTIES(${LIBTARGET} PROPERTIES PREFIX "lib")
-ENDIF(MSVC)
+if(MSVC)
+  set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
+endif(MSVC)
 
-SET_TARGET_PROPERTIES(${LIBTARGET}
+set_target_properties(${LIBTARGET}
     PROPERTIES
     OUTPUT_NAME "${LIBTARGET}"
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index f8b23ada38897d0d4ed66bff5fa765ea56b9e9cb..f8c50e5bed7fa213b2f13d49818319c3729df373 100644 (file)
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -69,8 +69,8 @@ if("$ENV{CC}" MATCHES ".*mingw.*")
 endif()
 
 if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
-       # To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare 
-       # it to the baseline. Kakadu binaries are freely available for non-commercial purposes 
+       # To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare
+       # it to the baseline. Kakadu binaries are freely available for non-commercial purposes
        # at http://www.kakadusoftware.com.
        # Here's the copyright notice from kakadu:
        # Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.
@@ -91,7 +91,7 @@ else()
        set(BUILD_TESTING "FALSE")
 endif(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
 
-# Options 
+# Options
 set( CACHE_CONTENTS "
 
 # Build kind
@@ -103,19 +103,19 @@ CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} ${CCFLAGS_WARNING}
 # Use to activate the test suite
 BUILD_TESTING:BOOL=${BUILD_TESTING}
 
-# Build Thirdparty, useful but not required for test suite 
+# Build Thirdparty, useful but not required for test suite
 BUILD_THIRDPARTY:BOOL=TRUE
 
 # JPEG2000 test files are available with git clone https://github.com/uclouvain/openjpeg-data.git
 OPJ_DATA_ROOT:PATH=$ENV{PWD}/data
 
-# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer  
+# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer
 JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}
 
 " )
 
 #---------------------
-#1. openjpeg specific: 
+#1. openjpeg specific:
 set( CTEST_PROJECT_NAME        "OPENJPEG" )
 if(NOT EXISTS $ENV{OPJ_SOURCE_DIR})
        message(FATAL_ERROR "OPJ_SOURCE_DIR not defined or does not exist:$ENV{OPJ_SOURCE_DIR}")

diff --git a/wrapping/java/CMakeLists.txt b/wrapping/java/CMakeLists.txt
index dd7b66c2f67e2882f191d58f06bb125f1fd8ed8f..fb28c236a847f704125ba2c5a584a05073be4da8 100644 (file)
--- a/wrapping/java/CMakeLists.txt
+++ b/wrapping/java/CMakeLists.txt
@@ -1,2 +1,2 @@
-# 
+#
 add_subdirectory(openjp2)