diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-04-13 15:24:36 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-04-13 15:24:36 +0000 |
| commit | a6f19781d71ebedeada4deefd6eeefcfa1bdce5e (patch) | |
| tree | 83e887f0263f8ff2c72cb8215fd972411387e1a3 /codec/CMakeLists.txt | |
| parent | e5f3a101608c3b5a90a518c904146a43e9372d7c (diff) | |
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
Diffstat (limited to 'codec/CMakeLists.txt')
| -rw-r--r-- | codec/CMakeLists.txt | 28 |
1 files changed, 5 insertions, 23 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) - - |