diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-01-31 22:35:51 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-01-31 22:35:51 +0000 |
| commit | 33b5757921fd177c063e1b885f6816bc0350664c (patch) | |
| tree | 799cdaaa4b4da5014e6551491b956ea183d04a32 /libopenjpeg | |
| parent | 355b88c15d2dcafe4074b725e2165511df02f2dd (diff) | |
ENH: Update CMake to match the new shared lib system (no more def file)
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.def.in | 25 |
2 files changed, 3 insertions, 48 deletions
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt index 46f9539c..9200772e 100644 --- a/libopenjpeg/CMakeLists.txt +++ b/libopenjpeg/CMakeLists.txt @@ -23,30 +23,10 @@ SET(OpenJPEG_SRCS tgt.c ) -# Prepare the .def file (Module definition) -# depending on wether we are: -# 1. Building a dll (shared lib) -# 2. Wether we are using cl or bcc32 (underscore convention) +# Pass proper definition to preprocessor to generate +# shared lib IF(WIN32 AND BUILD_SHARED_LIBS) - SET(UNDERSCORE) - # Borland expect symbol to start with _ - IF(BORLAND) - SET(UNDERSCORE "_") - ENDIF(BORLAND) - # Borland will by default use a .def file if present in - # the binary directory - CONFIGURE_FILE( - ${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.def.in - ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def - @ONLY IMMEDIATE - ) - # You can directly pass a .def file to cl this is - # recognized - IF(NOT BORLAND AND NOT MINGW) - SET(OpenJPEG_SRCS ${OpenJPEG_SRCS} - ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def - ) - ENDIF(NOT BORLAND AND NOT MINGW) + ADD_DEFINITIONS(-DOPJ_EXPORTS) ENDIF(WIN32 AND BUILD_SHARED_LIBS) # Create the library diff --git a/libopenjpeg/openjpeg.def.in b/libopenjpeg/openjpeg.def.in deleted file mode 100644 index 8a86443b..00000000 --- a/libopenjpeg/openjpeg.def.in +++ /dev/null @@ -1,25 +0,0 @@ -; This file was generated by CMake (http://cmake.org) -; Please see openjpeg/libopenjpeg/CMakeLists.txt and -; openjpeg/libopenjpeg/openjpeg.def.in for more -; information - -LIBRARY openjpeg.dll - -VERSION @OPENJPEG_MAJOR_VERSION@.@OPENJPEG_MINOR_VERSION@ - -EXPORTS @UNDERSCORE@opj_image_create - @UNDERSCORE@opj_image_destroy - @UNDERSCORE@opj_cio_open - @UNDERSCORE@opj_cio_close - @UNDERSCORE@cio_tell - @UNDERSCORE@opj_set_event_mgr - @UNDERSCORE@opj_create_decompress - @UNDERSCORE@opj_destroy_decompress - @UNDERSCORE@opj_set_default_decoder_parameters - @UNDERSCORE@opj_setup_decoder - @UNDERSCORE@opj_decode - @UNDERSCORE@opj_create_compress - @UNDERSCORE@opj_destroy_compress - @UNDERSCORE@opj_set_default_encoder_parameters - @UNDERSCORE@opj_setup_encoder - @UNDERSCORE@opj_encode |