summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulien Malik <julien.malik@paraiso.me>2016-05-02 16:03:16 +0200
committerJulien Malik <julien.malik@paraiso.me>2016-05-02 16:05:41 +0200
commit17a0a8a195a9aad76a6bdb174edc8aa5fb8b7831 (patch)
tree73afe14427af5b3b7b65633f04a1b86128b54144 /src
parentba0cf122f6820d38a7a5acc65b9d64392dd94e83 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/bin/common/CMakeLists.txt4
-rw-r--r--src/bin/jp2/CMakeLists.txt4
-rw-r--r--src/bin/jp3d/CMakeLists.txt16
-rw-r--r--src/bin/jpip/CMakeLists.txt2
-rw-r--r--src/bin/mj2/CMakeLists.txt4
-rw-r--r--src/lib/openjp2/CMakeLists.txt2
-rw-r--r--src/lib/openjp3d/CMakeLists.txt6
-rw-r--r--src/lib/openmj2/CMakeLists.txt6
8 files changed, 22 insertions, 22 deletions
diff --git a/src/bin/common/CMakeLists.txt b/src/bin/common/CMakeLists.txt
index bb07ba7c..017c23df 100644
--- 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 d583c2e6..dc013c21 100644
--- 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 5a35a169..3cac1a8f 100644
--- 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 821b2015..301d885b 100644
--- 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 78ad7543..5d3e288b 100644
--- 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 500e905c..367a7a8d 100644
--- 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 0bbafea3..26bf1788 100644
--- 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 dbb7e7ce..2ee1764b 100644
--- 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
#)