diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-12-05 15:19:57 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-12-05 15:19:57 +0000 |
| commit | c906c230fb403ff190d1730365026603f4c2c0d9 (patch) | |
| tree | 4238b0e4745b5e76dffeeeeebcbe02c2178d5b8d /codec | |
| parent | e33c029fdb7e6c0dbefb589d72f7f65920088f02 (diff) | |
revert to previous behaviour for cmake: builds (and links) dynamically by default. Static build only if -DBUILD_SHARED_LIBS is set to OFF.
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index bf08bc00..9e35ea7a 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -24,17 +24,10 @@ IF(DONT_HAVE_GETOPT) ) ENDIF(DONT_HAVE_GETOPT) - -# Do the proper thing when building static...if only there was configured -# headers or def files instead -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} ${OPENJPEG_LIBRARY_NAME}_JP3D.static) # ${TIFF_LIBRARIES}) + TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME}_JP3D) # ${TIFF_LIBRARIES}) # On unix you need to link to the math library: IF(UNIX) TARGET_LINK_LIBRARIES(${exe} m) |