Changeset 450

Timestamp:

08/03/09 12:44:13 (16 years ago)

Author:

r2d

Message:

libmpc (patch by Samuli Suominen) :

• add install target for cmake
• add a shared option for libmpcdec

Location:

libmpc/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• include/CMakeLists.txt (added)
• mpc2sv8/CMakeLists.txt (modified) (2 diffs)
• mpcchap/CMakeLists.txt (modified) (2 diffs)
• mpccut/CMakeLists.txt (modified) (2 diffs)
• mpcdec/CMakeLists.txt (modified) (1 diff)
• mpcgain/CMakeLists.txt (modified) (2 diffs)
• wavcmp/CMakeLists.txt (added)

libmpc/trunk/CMakeLists.txt

@@ -6 +6 @@
 set(CMAKE_VERBOSE_MAKEFILE false)
 TEST_BIG_ENDIAN(MPC_ENDIANNESS)
+
+option(SHARED "Use shared libmpcdec" OFF)
 
 add_definitions(-DFAST_MATH -DCVD_FASTLOG)
@@ -23 +25 @@
 add_subdirectory(mpccut)
 add_subdirectory(mpcchap)
+add_subdirectory(wavcmp)
+add_subdirectory(include)

libmpc/trunk/mpc2sv8/CMakeLists.txt

@@ -13 +13 @@
 add_executable(mpc2sv8 mpc2sv8.c)
 
-target_link_libraries(mpc2sv8 mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpc2sv8 mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpc2sv8 mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpc2sv8 mpcenc_static)
 
@@ -28 +33 @@
 endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
 
+install(TARGETS mpc2sv8 RUNTIME DESTINATION bin)

libmpc/trunk/mpcchap/CMakeLists.txt

@@ -15 +15 @@
 add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags)
 
-target_link_libraries(mpcchap mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpcchap mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcchap mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpcchap mpcenc_static)
 target_link_libraries(mpcchap ${CUEFILE_LIBRARY})
@@ -23 +28 @@
 endif(NOT MSVC)
 
+install(TARGETS mpcchap RUNTIME DESTINATION bin)

libmpc/trunk/mpccut/CMakeLists.txt

@@ -13 +13 @@
 add_executable(mpccut mpccut)
 
-target_link_libraries(mpccut mpcdec_static)
+if(SHARED)
+  target_link_libraries(mpccut mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpccut mpcdec_static)
+endif(SHARED)
+
 target_link_libraries(mpccut mpcenc_static)
 
@@ -20 +25 @@
 endif(NOT MSVC)
 
+install(TARGETS mpccut RUNTIME DESTINATION bin)

libmpc/trunk/mpcdec/CMakeLists.txt

@@ -18 +18 @@
 
 target_link_libraries(mpcdec wavformat_static)
-target_link_libraries(mpcdec mpcdec_static)
+
+if(SHARED)
+  target_link_libraries(mpcdec mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcdec mpcdec_static)
+endif(SHARED)
+
+install(TARGETS mpcdec RUNTIME DESTINATION bin)

libmpc/trunk/mpcgain/CMakeLists.txt

@@ -19 +19 @@
 
 target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
-target_link_libraries(mpcgain mpcdec_static)
+
+if(SHARED)
+  target_link_libraries(mpcgain mpcdec_shared)
+else(SHARED)
+  target_link_libraries(mpcgain mpcdec_static)
+endif(SHARED)
 
 if(NOT MSVC)
@@ -25 +30 @@
 endif(NOT MSVC)
 
+install(TARGETS mpcgain RUNTIME DESTINATION bin)