Make files clean up and fixing build error

Change-Id: I76c89b0b1ebcbcbdfa77c0c2eee78a1fd986e58f
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03770f7..5f7e87c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,129 +1,55 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(mm-utility C)
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(fw_name "mm-utility")
 
-SET(BMP-LIB "mmutil_bmp")
-SET(GIF-LIB "mmutil_gif")
-SET(IMGCV-LIB "mmutil_imgcv")
-SET(IMGP-LIB "mmutil_imgp")
-SET(JPEG-LIB "mmutil_jpeg")
-SET(PNG-LIB "mmutil_png")
-
-SET(BMP_SRCS bmp/mm_util_bmp.c)
-SET(GIF_SRCS gif/mm_util_gif.c)
-SET(IMGCV_SRCS imgcv/mm_util_imgcv.c)
-SET(IMGP_SRCS imgp/mm_util_imgp.c)
-SET(JPEG_SRCS jpeg/mm_util_jpeg.c)
-SET(PNG_SRCS png/mm_util_png.c)
-
-SET(VENDOR "samsung")
-SET(PACKAGE ${PROJECT_NAME})
-SET(PKGNAME "com.${VENDOR}.${PACKAGE}")
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-
-IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-       SET(CMAKE_BUILD_TYPE "Release")
-ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
-MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
+PROJECT(${fw_name})
 
 SET(INC_DIR
-       bmp/include
        common/include
-       gif/include
-       imgcv/include
-       imgp/include
-       jpeg/include
-       png/include
        )
-INCLUDE_DIRECTORIES(${INC_DIR})
-
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED dlog glib-2.0 gio-2.0 gmodule-2.0 libtzplatform-config opencv)
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC")
-
-IF("${ARCH}" STREQUAL "arm")
-       ADD_DEFINITIONS("-DTARGET")
-       MESSAGE("add -DTARGET")
-ENDIF("${ARCH}" STREQUAL "arm")
-
-ADD_DEFINITIONS("-DVENDOR=\"${VENDOR}\"")
-ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
-ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
-ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
-ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
-ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
-ADD_DEFINITIONS("-DTIZEN_DEBUG")
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both")
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc.in ${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc.in ${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc.in ${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgp/mmutil-imgp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jpeg/mmutil-jpeg.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgcv/mmutil-imgcv.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bmp/mmutil-bmp.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gif/mmutil-gif.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/png/mmutil-png.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
-ADD_SUBDIRECTORY(bmp/test)
-ADD_SUBDIRECTORY(gif/test)
-ADD_SUBDIRECTORY(imgcv/test)
-ADD_SUBDIRECTORY(imgp/test)
-ADD_SUBDIRECTORY(jpeg/test)
-ADD_SUBDIRECTORY(png/test)
-
-LINK_DIRECTORIES(${LIB_INSTALL_DIR})
-
-ADD_LIBRARY(${IMGP-LIB} SHARED ${IMGP_SRCS})
-TARGET_LINK_LIBRARIES(${IMGP-LIB} ${pkgs_LDFLAGS})
-SET_TARGET_PROPERTIES(${IMGP-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${IMGP-LIB} PROPERTIES VERSION ${VERSION})
-ADD_LIBRARY(${JPEG-LIB} SHARED ${JPEG_SRCS})
-TARGET_LINK_LIBRARIES(${JPEG-LIB} ${pkgs_LDFLAGS} ${IMGP-LIB} jpeg turbojpeg)
-SET_TARGET_PROPERTIES(${JPEG-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${JPEG-LIB} PROPERTIES VERSION ${VERSION})
-ADD_LIBRARY(${IMGCV-LIB} SHARED ${IMGCV_SRCS})
-TARGET_LINK_LIBRARIES(${IMGCV-LIB} ${pkgs_LDFLAGS})
-SET_TARGET_PROPERTIES(${IMGCV-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${IMGCV-LIB} PROPERTIES VERSION ${VERSION})
-ADD_LIBRARY(${BMP-LIB} SHARED ${BMP_SRCS})
-TARGET_LINK_LIBRARIES(${BMP-LIB} ${pkgs_LDFLAGS} bmp nsbmp)
-SET_TARGET_PROPERTIES(${BMP-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${BMP-LIB} PROPERTIES VERSION ${VERSION})
-ADD_LIBRARY(${GIF-LIB} SHARED ${GIF_SRCS})
-TARGET_LINK_LIBRARIES(${GIF-LIB} ${pkgs_LDFLAGS} gif)
-SET_TARGET_PROPERTIES(${GIF-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${GIF-LIB} PROPERTIES VERSION ${VERSION})
-ADD_LIBRARY(${PNG-LIB} SHARED ${PNG_SRCS})
-TARGET_LINK_LIBRARIES(${PNG-LIB} ${pkgs_LDFLAGS} png)
-SET_TARGET_PROPERTIES(${PNG-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${PNG-LIB} PROPERTIES VERSION ${VERSION})
-
-INSTALL(TARGETS ${IMGP-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${JPEG-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${IMGCV-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${BMP-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${GIF-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${PNG-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 
-INSTALL(FILES bmp/include/mm_util_bmp.h DESTINATION include/mmf)
-INSTALL(FILES common/include/mm_util_type.h DESTINATION include/mmf)
-INSTALL(FILES gif/include/mm_util_gif.h DESTINATION include/mmf)
-INSTALL(FILES imgcv/include/mm_util_imgcv.h DESTINATION include/mmf)
-INSTALL(FILES imgp/include/mm_util_imgp.h DESTINATION include/mmf)
-INSTALL(FILES jpeg/include/mm_util_jpeg.h DESTINATION include/mmf)
-INSTALL(FILES png/include/mm_util_png.h DESTINATION include/mmf)
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_debug.h" EXCLUDE
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+ADD_SUBDIRECTORY(bmp)
+ADD_SUBDIRECTORY(gif)
+ADD_SUBDIRECTORY(imgcv)
+ADD_SUBDIRECTORY(imgp)
+ADD_SUBDIRECTORY(jpeg)
+ADD_SUBDIRECTORY(png)
+
+IF(UNIX)
+
+ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
+ADD_CUSTOM_COMMAND(
+        DEPENDS clean
+        COMMENT "distribution clean"
+        COMMAND find
+        ARGS    .
+        -not -name config.cmake -and \(
+        -name tester.c -or
+        -name Testing -or
+        -name CMakeFiles -or
+        -name cmake.depends -or
+        -name cmake.check_depends -or
+        -name CMakeCache.txt -or
+        -name cmake.check_cache -or
+        -name *.cmake -or
+        -name Makefile -or
+        -name core -or
+        -name core.* -or
+        -name gmon.out -or
+        -name install_manifest.txt -or
+        -name *.pc -or
+        -name *~ \)
+        | grep -v TC | xargs rm -rf
+        TARGET  distclean
+        VERBATIM
+)
+
+ENDIF(UNIX)

diff --git a/bmp/CMakeLists.txt b/bmp/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..053b0c1
--- /dev/null
+++ b/bmp/CMakeLists.txt
@@ -0,0 +1,71 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_bmp")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       )
+
+SET(dependents "dlog glib-2.0")
+SET(pc_dependents "dlog capi-base-common")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-bmp)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/bmp/mmutil-bmp.pc.in b/bmp/mmutil-bmp.pc.in
index b69e0a3..1950745 100644 (file)
--- a/bmp/mmutil-bmp.pc.in
+++ b/bmp/mmutil-bmp.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-bmp
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @BMP_REQPKG@
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_bmp
-Cflags : -I${includedir}/mmf
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir}

diff --git a/bmp/test/CMakeLists.txt b/bmp/test/CMakeLists.txt
index 60c7b27..498ae6e 100755 (executable)
--- a/bmp/test/CMakeLists.txt
+++ b/bmp/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_bmp")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/gif/CMakeLists.txt b/gif/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..59339b2
--- /dev/null
+++ b/gif/CMakeLists.txt
@@ -0,0 +1,71 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_gif")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       )
+
+SET(dependents "dlog glib-2.0 gio-2.0")
+SET(pc_dependents "dlog capi-base-common")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} gif)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-gif)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/gif/mmutil-gif.pc.in b/gif/mmutil-gif.pc.in
index 5d7734b..1950745 100644 (file)
--- a/gif/mmutil-gif.pc.in
+++ b/gif/mmutil-gif.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-gif
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @GIF_REQPKG@
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_gif
-Cflags : -I${includedir}/mmf
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir}

diff --git a/gif/test/CMakeLists.txt b/gif/test/CMakeLists.txt
index 5545a6a..9ccd456 100755 (executable)
--- a/gif/test/CMakeLists.txt
+++ b/gif/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_gif")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/imgcv/CMakeLists.txt b/imgcv/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..dbc9919
--- /dev/null
+++ b/imgcv/CMakeLists.txt
@@ -0,0 +1,72 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_imgcv")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       ../jpeg/include
+       )
+
+SET(dependents "dlog glib-2.0 opencv")
+SET(pc_dependents "dlog capi-base-common opencv")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-imgcv)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/imgcv/mmutil-imgcv.pc.in b/imgcv/mmutil-imgcv.pc.in
index 7dc41d0..1950745 100755 (executable)
--- a/imgcv/mmutil-imgcv.pc.in
+++ b/imgcv/mmutil-imgcv.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-imgcv
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @IMGCV_REQPKG@ opencv
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_imgcv
-Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir}

diff --git a/imgcv/test/CMakeLists.txt b/imgcv/test/CMakeLists.txt
index 6e2d146..8748493 100755 (executable)
--- a/imgcv/test/CMakeLists.txt
+++ b/imgcv/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_imgcv")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
@@ -14,5 +14,5 @@ FOREACH(src ${sources})
     GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
     MESSAGE("${src_name}")
     ADD_EXECUTABLE(${src_name} ${src})
-    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${JPEG-LIB} ${${fw_test}_LDFLAGS})
+    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${JPEG-LIB} ${${fw_test}_LDFLAGS} mmutil_jpeg)
 ENDFOREACH()

diff --git a/imgp/CMakeLists.txt b/imgp/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..ed007d2
--- /dev/null
+++ b/imgp/CMakeLists.txt
@@ -0,0 +1,71 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_imgp")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       )
+
+SET(dependents "dlog glib-2.0 gmodule-2.0")
+SET(pc_dependents "dlog capi-base-common")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} bmp nsbmp)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-imgp)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/imgp/mmutil-imgp.pc.in b/imgp/mmutil-imgp.pc.in
index ae6e3f9..3004389 100755 (executable)
--- a/imgp/mmutil-imgp.pc.in
+++ b/imgp/mmutil-imgp.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-imgp
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @IMGP_REQPKG@
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_imgp
-Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir} -DLIBPREFIX=\"${libdir}\"

diff --git a/imgp/test/CMakeLists.txt b/imgp/test/CMakeLists.txt
index 1202b86..6a804d0 100755 (executable)
--- a/imgp/test/CMakeLists.txt
+++ b/imgp/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_imgp")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..2a77cc2
--- /dev/null
+++ b/jpeg/CMakeLists.txt
@@ -0,0 +1,72 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_jpeg")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       ../imgp/include
+       )
+
+SET(dependents "dlog glib-2.0")
+SET(pc_dependents "dlog capi-base-common")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} mmutil_imgp jpeg turbojpeg)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-jpeg)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/jpeg/mmutil-jpeg.pc.in b/jpeg/mmutil-jpeg.pc.in
index b8598bb..3004389 100644 (file)
--- a/jpeg/mmutil-jpeg.pc.in
+++ b/jpeg/mmutil-jpeg.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-jpeg
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @JPEG_REQPKG@
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_jpeg
-Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir} -DLIBPREFIX=\"${libdir}\"

diff --git a/jpeg/test/CMakeLists.txt b/jpeg/test/CMakeLists.txt
index d0aa2cb..0cf2e46 100755 (executable)
--- a/jpeg/test/CMakeLists.txt
+++ b/jpeg/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_jpeg")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..a0d9953
--- /dev/null
+++ b/png/CMakeLists.txt
@@ -0,0 +1,71 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(fw_name "mmutil_png")
+
+PROJECT(${fw_name})
+
+SET(VERSION_MAJOR 0)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+
+SET(INC_DIR
+       include
+       )
+INCLUDE_DIRECTORIES(${INC_DIR}
+       ../common/include
+       )
+
+SET(dependents "dlog glib-2.0")
+SET(pc_dependents "dlog capi-base-common")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${fw_name} REQUIRED ${dependents})
+FOREACH(flag ${${fw_name}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+
+IF("${ARCH}" STREQUAL "arm")
+    ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DTIZEN_DEBUG")
+
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
+
+aux_source_directory(. SOURCES)
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} png)
+SET_TARGET_PROPERTIES(${fw_name}
+       PROPERTIES
+       VERSION ${VERSION}
+       SOVERSION ${VERSION_MAJOR}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(
+        DIRECTORY ${INC_DIR}/ DESTINATION include/mmf
+        FILES_MATCHING
+        PATTERN "*_internal.h" EXCLUDE
+        PATTERN "*_private.h" EXCLUDE
+        PATTERN "${INC_DIR}/*.h"
+        )
+
+SET(PC_NAME mmutil-png)
+SET(PC_REQUIRED ${pc_dependents})
+SET(PC_LDFLAGS -l${fw_name})
+SET(PC_FILE_NAME ${PC_NAME}.pc.in)
+
+CONFIGURE_FILE(
+    ${PC_FILE_NAME}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+ADD_SUBDIRECTORY(test)

diff --git a/png/mmutil-png.pc.in b/png/mmutil-png.pc.in
index de754c4..1950745 100644 (file)
--- a/png/mmutil-png.pc.in
+++ b/png/mmutil-png.pc.in
@@ -1,12 +1,11 @@
 prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+exec_prefix=/usr
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=/usr/include/mmf
 
-Name : mmutil-png
+Name : @PC_NAME@
 Description : Multimedia Framework Utility Library
-Requires : @PNG_REQPKG@
+Requires : @PC_REQUIRED@
 Version : @VERSION@
-Libs : -L${libdir} -lmmutil_png
-Cflags : -I${includedir}/mmf
-
+Libs : -L${libdir} @PC_LDFLAGS@
+Cflags : -I${includedir}

diff --git a/png/test/CMakeLists.txt b/png/test/CMakeLists.txt
index 44aa4a3..bac86ec 100755 (executable)
--- a/png/test/CMakeLists.txt
+++ b/png/test/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(fw_name "mmutil_png")
 SET(fw_test "${fw_name}-test")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 gmodule-2.0 dlog libtzplatform-config)
+pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog libtzplatform-config)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)