diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-11-28 17:07:04 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-11-28 17:07:04 +0000 |
| commit | e33c029fdb7e6c0dbefb589d72f7f65920088f02 (patch) | |
| tree | cc316e0c703dd38e137d3001b176652903197a50 /codec | |
| parent | fb6d84918d3fd6845f3a8376fc92984839783a2a (diff) | |
changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries).
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index 24595c7a..bf08bc00 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -27,16 +27,14 @@ ENDIF(DONT_HAVE_GETOPT) # Do the proper thing when building static...if only there was configured # headers or def files instead -IF(NOT BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DOPJ_STATIC) -ENDIF(NOT BUILD_SHARED_LIBS) +ADD_DEFINITIONS(-DOPJ_STATIC) #FIND_PACKAGE(TIFF REQUIRED) # Loop over all executables: FOREACH(exe jp3d_to_volume volume_to_jp3d) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) - TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjp3dvm) # ${TIFF_LIBRARIES}) + TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME}_JP3D.static) # ${TIFF_LIBRARIES}) # On unix you need to link to the math library: IF(UNIX) TARGET_LINK_LIBRARIES(${exe} m) |