summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-30 17:14:39 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-30 17:14:39 +0000
commitd5bb3b0039159a61c7e9b2ae157a7b6ec2c0aef5 (patch)
tree8114a5c8fef51e462e9baea495ad0fe210c3b3a6 /libopenjpeg
parentf16216e2708c3b480f726d64b589f092bbc48b02 (diff)
[trunk] Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. This also changes all the key words to lower case. The primary reason for changing key words is that all documentation for CMakeLists.txt now shows the key words as lower case. Even the printed “Mastering CMake v5” uses lower case. Thanks to Hans Johnson
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/CMakeLists.txt40
-rw-r--r--libopenjpeg/jpwl/CMakeLists.txt32
2 files changed, 36 insertions, 36 deletions
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index cc9a23cd..9a408342 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -1,6 +1,6 @@
-INCLUDE_REGULAR_EXPRESSION("^.*$")
+include_regular_expression("^.*$")
# Defines the source code for the library
-SET(OPENJPEG_SRCS
+set(OPENJPEG_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/bio.c
${CMAKE_CURRENT_SOURCE_DIR}/cio.c
${CMAKE_CURRENT_SOURCE_DIR}/dwt.c
@@ -28,26 +28,26 @@ SET(OPENJPEG_SRCS
)
# Build the library
-IF(WIN32)
- IF(BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_EXPORTS)
- ELSE(BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_STATIC)
- ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-IF(UNIX)
- TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
-ENDIF(UNIX)
-SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+if(WIN32)
+ if(BUILD_SHARED_LIBS)
+ add_definitions(-DOPJ_EXPORTS)
+ else(BUILD_SHARED_LIBS)
+ add_definitions(-DOPJ_STATIC)
+ endif(BUILD_SHARED_LIBS)
+endif(WIN32)
+add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
+if(UNIX)
+ target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
+endif(UNIX)
+set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
# Build the JPWL library ?
-IF(BUILD_JPWL)
- ADD_SUBDIRECTORY(jpwl)
-ENDIF(BUILD_JPWL)
+if(BUILD_JPWL)
+ add_subdirectory(jpwl)
+endif(BUILD_JPWL)
# Install library
-INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
+install(TARGETS ${OPENJPEG_LIBRARY_NAME}
EXPORT OpenJPEGTargets
RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
@@ -55,12 +55,12 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
)
# Install includes files
-INSTALL(FILES openjpeg.h opj_stdint.h
+install(FILES openjpeg.h opj_stdint.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
)
# install man page of the library
-INSTALL(
+install(
FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3
DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
diff --git a/libopenjpeg/jpwl/CMakeLists.txt b/libopenjpeg/jpwl/CMakeLists.txt
index f8512cda..3bb5632d 100644
--- a/libopenjpeg/jpwl/CMakeLists.txt
+++ b/libopenjpeg/jpwl/CMakeLists.txt
@@ -1,33 +1,33 @@
# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-ADD_DEFINITIONS(-DUSE_JPWL)
+add_definitions(-DUSE_JPWL)
-SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
-IF(APPLE)
- SET_SOURCE_FILES_PROPERTIES(
+set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
+if(APPLE)
+ set_source_files_properties(
rs.c
PROPERTIES
COMPILE_FLAGS -fno-common)
-ENDIF(APPLE)
+endif(APPLE)
-INCLUDE_DIRECTORIES(
+include_directories(
${OPENJPEG_SOURCE_DIR}/libopenjpeg
)
# Build the library
-IF(WIN32)
- IF(BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_EXPORTS)
- ELSE(BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_STATIC)
- ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
-SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL
+if(WIN32)
+ if(BUILD_SHARED_LIBS)
+ add_definitions(-DOPJ_EXPORTS)
+ else(BUILD_SHARED_LIBS)
+ add_definitions(-DOPJ_STATIC)
+ endif(BUILD_SHARED_LIBS)
+endif(WIN32)
+add_library(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
+set_target_properties(${OPENJPEG_LIBRARY_NAME}_JPWL
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
# Install library
-INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
+install(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
EXPORT OpenJPEGTargets
RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries