From f71af2a2ef70a58c10a247cb4693b3c335f674d5 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Fri, 28 Sep 2012 08:51:14 +0000
Subject: [PATCH] [trunk] FolderReorgProposal task: refactor MJ2

Update issue 177
---
 src/bin/CMakeLists.txt             |  4 +++-
 src/bin/mj2/CMakeLists.txt         |  7 +++---
 src/lib/CMakeLists.txt             |  9 ++++---
 src/lib/openmj2/CMakeLists.txt     | 38 ++++++++++++++++++++++++++++++
 src/{bin/mj2 => lib/openmj2}/mj2.c |  0
 src/{bin/mj2 => lib/openmj2}/mj2.h |  0
 6 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 src/lib/openmj2/CMakeLists.txt
 rename src/{bin/mj2 => lib/openmj2}/mj2.c (100%)
 rename src/{bin/mj2 => lib/openmj2}/mj2.h (100%)

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index fa94d070..2abada1b 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -17,4 +17,6 @@ if(BUILD_JP3D)
   add_subdirectory(jp3d)
 endif()
 
-add_subdirectory(wx)
+if(BUILD_VIEWER)
+  add_subdirectory(wx)
+endif()
diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
index 44514c54..601f3bd9 100644
--- a/src/bin/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -30,7 +30,7 @@ ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
 )
 
-set(MJ2_SRCS mj2.c mj2_convert.c)
+#set(MJ2_SRCS mj2.c mj2_convert.c)
 
 if(WIN32)
   add_definitions(-DOPJ_STATIC)
@@ -39,6 +39,7 @@ endif()
 # Headers file are located here:
 include_directories(
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${LCMS_INCLUDE_DIRNAME}
   )
@@ -49,7 +50,7 @@ add_executable(frames_to_mj2
   ${OPJ_SRCS}
   ${MJ2_SRCS}
   )
-target_link_libraries(frames_to_mj2 ${LCMS_LIBNAME})
+target_link_libraries(frames_to_mj2 ${LCMS_LIBNAME} openmj2)
 
 if(UNIX)
   target_link_libraries(frames_to_mj2 m)
@@ -73,7 +74,7 @@ add_executable(extract_j2k_from_mj2
     ${OPJ_SRCS}
     ${MJ2_SRCS}
     )
-target_link_libraries(extract_j2k_from_mj2 ${LCMS_LIBNAME})
+target_link_libraries(extract_j2k_from_mj2 ${LCMS_LIBNAME} openmj2)
 
 if(UNIX)
   target_link_libraries(extract_j2k_from_mj2 m)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index b69399a5..da8846b6 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -3,12 +3,15 @@
 add_subdirectory(openjp2)
 
 # optionals components:
-if(BUILD_JPIP)
-  add_subdirectory(openjpip)
-endif()
 if(BUILD_JPWL)
   add_subdirectory(openjpwl)
 endif()
+if(BUILD_MJ2)
+  add_subdirectory(openmj2)
+endif()
+if(BUILD_JPIP)
+  add_subdirectory(openjpip)
+endif()
 if(BUILD_JP3D)
   add_subdirectory(openjp3d)
 endif()
diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
new file mode 100644
index 00000000..b3ba90bd
--- /dev/null
+++ b/src/lib/openmj2/CMakeLists.txt
@@ -0,0 +1,38 @@
+set(OPENMJ2_LIBRARY_NAME openmj2)
+set(OPENMJ2_SRCS
+  mj2.c
+)
+
+# 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)
+
+include_directories(
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  )
+
+# build mj2 lib:
+add_library(${OPENMJ2_LIBRARY_NAME} ${OPENMJ2_SRCS})
+target_link_libraries(${OPENMJ2_LIBRARY_NAME} openjpeg)
+if(UNIX)
+  target_link_libraries(${OPENMJ2_LIBRARY_NAME} m)
+endif()
+set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+
+# Install library
+install(TARGETS ${OPENMJ2_LIBRARY_NAME}
+  EXPORT OpenMJ2Targets
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} 
+  COMPONENT Libraries
+)
+
+# Install includes files
+#INSTALL(FILES mj2.h
+#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} 
+#  COMPONENT Headers
+#)
diff --git a/src/bin/mj2/mj2.c b/src/lib/openmj2/mj2.c
similarity index 100%
rename from src/bin/mj2/mj2.c
rename to src/lib/openmj2/mj2.c
diff --git a/src/bin/mj2/mj2.h b/src/lib/openmj2/mj2.h
similarity index 100%
rename from src/bin/mj2/mj2.h
rename to src/lib/openmj2/mj2.h