renamed and reorganized "jp3d" directory to "openjpeg3d". Is now a standalone directory, with independent cmake files. Done as it uses its own version of the openjpeg library and does not depend on the one currently developped. Will be removed from the trunk and stored in a branch.openjpeg3d@749

5 files changed, 8 insertions, 63 deletions

diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index 6c33b963..437b1e05 100644
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -4,25 +4,6 @@
 SET(common_SRCS
   convert.c
   )
-# Then check if getopt is present:
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-SET(DONT_HAVE_GETOPT 1)
-IF(UNIX) #I am pretty sure only *nix sys have this anyway
-  CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H)
-  # Seems like we need the contrary:
-  IF(CMAKE_HAVE_GETOPT_H)
-    SET(DONT_HAVE_GETOPT 0)
-  ENDIF(CMAKE_HAVE_GETOPT_H)
-ENDIF(UNIX)
-
-# If not getopt was found then add it to the lib:
-IF(DONT_HAVE_GETOPT)
-  ADD_DEFINITIONS(-DDONT_HAVE_GETOPT)
-  SET(common_SRCS
-    ${common_SRCS}
-    getopt.c
-  )
-ENDIF(DONT_HAVE_GETOPT)
 
 IF(WIN32)
   IF(BUILD_SHARED_LIBS)
@@ -35,13 +16,14 @@ ENDIF(WIN32)
 # Loop over all executables:
 FOREACH(exe jp3d_to_volume volume_to_jp3d)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
-  TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME}_JP3D) # ${TIFF_LIBRARIES})
+  TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG3D_LIBRARY_NAME})
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} m)
   ENDIF(UNIX)
   # Install exe
-  INSTALL_TARGETS(/bin/ ${exe})
+  INSTALL(TARGETS ${exe}
+    EXPORT OpenJPEG3DTargets
+    DESTINATION ${OPENJPEG3D_INSTALL_BIN_DIR} COMPONENT Applications
+  )
 ENDFOREACH(exe)
-
-
diff --git a/codec/Makefile.nix b/codec/Makefile.nix
deleted file mode 100644
index e34ad39c..00000000
--- a/codec/Makefile.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-#jp3d/codec/Makefile
-
-include ../../config.nix
-
-INSTALL_BIN = $(prefix)/bin
-CFLAGS = -Wall -I. -I../libjp3dvm -lstdc++ # -g -p -pg
-#USERLIBS = -lm
-
-ifeq ($(ENABLE_SHARED),yes)
-ELIB = ../libopenjp3dvm.so.$(JP3D_MAJOR).$(JP3D_MINOR).$(JP3D_BUILD)
-else
-ELIB = ../libopenjp3dvm.a
-endif
-
-all: jp3d_to_volume volume_to_jp3d
-	install -d ../../bin
-	install jp3d_to_volume volume_to_jp3d ../../bin
-
-jp3d_to_volume: jp3d_to_volume.c $(ELIB)
-	$(CC) $(CFLAGS) getopt.c convert.c jp3d_to_volume.c \
-	-o jp3d_to_volume  $(ELIB) $(USERLIBS)
-
-volume_to_jp3d: volume_to_jp3d.c  $(ELIB)
-	$(CC) $(CFLAGS) getopt.c convert.c volume_to_jp3d.c \
-	-o volume_to_jp3d  $(ELIB) $(USERLIBS)
-
-clean:
-	rm -f jp3d_to_volume volume_to_jp3d
-
-install: all
-	install -d $(DESTDIR)$(INSTALL_BIN)
-	install -m 755 -o root -g root jp3d_to_volume $(DESTDIR)$(INSTALL_BIN)
-	install -m 755 -o root -g root volume_to_jp3d $(DESTDIR)$(INSTALL_BIN)
-
-uninstall:
-	rm -f $(DESTDIR)$(INSTALL_BIN)/jp3d_to_volume
-	rm -f $(DESTDIR)$(INSTALL_BIN)/volume_to_jp3d
diff --git a/codec/convert.c b/codec/convert.c
index 7a5d177d..ff4dec3b 100755
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../libjp3dvm/openjpeg3d.h"
+#include "openjpeg3d.h"
 #ifdef _WIN32
 #include "windirent.h"
 #else
diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c
index 9c5c9adb..e133d876 100755
--- a/codec/jp3d_to_volume.c
+++ b/codec/jp3d_to_volume.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>

 #include <math.h>

 

-#include "../libjp3dvm/openjpeg3d.h"

+#include "openjpeg3d.h"

 #include "getopt.h"

 #include "convert.h"

 

diff --git a/codec/volume_to_jp3d.c b/codec/volume_to_jp3d.c
index e00785d4..acfcd10e 100755
--- a/codec/volume_to_jp3d.c
+++ b/codec/volume_to_jp3d.c
@@ -32,7 +32,7 @@
 #include <string.h>

 #include <stdlib.h>

 

-#include "../libjp3dvm/openjpeg3d.h"

+#include "openjpeg3d.h"

 #include "getopt.h"

 #include "convert.h"