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 | 59d9b97ffe35f17c71b25a749b885054cb4727d9 (patch) | |
| tree | fc0cec46837de8bc05d66add2ffeb0c69ccaecdd /mj2 | |
| parent | cf39198a9a93455ca65114258197c5fd4f8216e2 (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 'mj2')
| -rw-r--r-- | mj2/CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mj2/CMakeLists.txt b/mj2/CMakeLists.txt index f678ee83..9f92a52c 100644 --- a/mj2/CMakeLists.txt +++ b/mj2/CMakeLists.txt @@ -7,17 +7,13 @@ INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} ) -# Do the proper thing when building static...if only there was configured -# headers or def files instead -ADD_DEFINITIONS(-DOPJ_STATIC) - ADD_EXECUTABLE(frames_to_mj2 frames_to_mj2.c ${PROJECT_SOURCE_DIR}/codec/compat/getopt.c mj2_convert.c mj2.c ) -TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPENJPEG_LIBRARY_NAME}.static ${LCMS_LIB}) +TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPENJPEG_LIBRARY_NAME} ${LCMS_LIB}) IF(UNIX) TARGET_LINK_LIBRARIES(frames_to_mj2 m) ENDIF(UNIX) @@ -28,7 +24,7 @@ ADD_EXECUTABLE(mj2_to_frames mj2_convert.c mj2.c ) -TARGET_LINK_LIBRARIES(mj2_to_frames ${OPENJPEG_LIBRARY_NAME}.static ${LCMS_LIB}) +TARGET_LINK_LIBRARIES(mj2_to_frames ${OPENJPEG_LIBRARY_NAME} ${LCMS_LIB}) IF(UNIX) TARGET_LINK_LIBRARIES(mj2_to_frames m) ENDIF(UNIX) @@ -36,7 +32,7 @@ ENDIF(UNIX) ADD_EXECUTABLE(extract_j2k_from_mj2 extract_j2k_from_mj2.c mj2.c ) -TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPENJPEG_LIBRARY_NAME}.static ${LCMS_LIB}) +TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPENJPEG_LIBRARY_NAME} ${LCMS_LIB}) IF(UNIX) TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m) ENDIF(UNIX) @@ -44,7 +40,7 @@ ENDIF(UNIX) ADD_EXECUTABLE(wrap_j2k_in_mj2 wrap_j2k_in_mj2.c mj2.c ) -TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPENJPEG_LIBRARY_NAME}.static ${LCMS_LIB}) +TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPENJPEG_LIBRARY_NAME} ${LCMS_LIB}) IF(UNIX) TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m) ENDIF(UNIX) |