File hydrogen-0.9.6-lib64.patch of Package hydrogen

Overview Repositories Revisions Requests Users Attributes Meta

File hydrogen-0.9.6-lib64.patch of Package hydrogen (Revision 8216409cd56eb9afff053f68b6fada34)

Currently displaying revision 8216409cd56eb9afff053f68b6fada34 , Show latest

Index: src/core/CMakeLists.txt
===================================================================
--- src/core/CMakeLists.txt.orig	2011-01-14 13:03:25.000000000 +0200
+++ src/core/CMakeLists.txt	2011-10-09 19:32:55.758068137 +0200
@@ -5,7 +5,7 @@ FILE(GLOB_RECURSE hydrogen_INCLUDES incl
 FILE(GLOB_RECURSE hydrogen_SOURCES src/*.cpp src/*.cc src/*.c)
 LIST(APPEND hydrogen_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h)
 
-ADD_LIBRARY( hydrogen-core-${VERSION} ${H2CORE_LIBRARY_TYPE} ${hydrogen_SOURCES})
+ADD_LIBRARY( hydrogen-core ${H2CORE_LIBRARY_TYPE} ${hydrogen_SOURCES})
 INCLUDE_DIRECTORIES( include
     ${CMAKE_SOURCE_DIR}/include                 # regular headers
     ${CMAKE_CURRENT_BINARY_DIR}/include         # generated config.h
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( include
     ${RUBBERBAND_INCLUDE_DIR}
 )
 
-TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+TARGET_LINK_LIBRARIES(hydrogen-core
     ${QT_QTCORE_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTXMLPATTERNS_LIBRARY}
@@ -52,14 +52,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
     ${NSMSESSION_LIBRARIES}
 )
 
-#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
+SET_TARGET_PROPERTIES(hydrogen-core PROPERTIES SOVERSION ${H2CORE_LIBRARY_SONAME})
 
-INSTALL(TARGETS hydrogen-core-${VERSION}
-    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+# SOVERSION ${coreversion} LINK_FLAGS '-Wl,-soname=libhydrogen-core.so.${soversion}"
+
+if(H2CORE_LIBRARY_TYPE STREQUAL SHARED)
+    INSTALL(TARGETS hydrogen-core
+    LIBRARY DESTINATION ${CMAKE_CURRENT_LIBRARY_DIR})
+    elseif(H2CORE_LIBRARY_TYPE STREQUAL STATIC)
+INSTALL(TARGETS hydrogen-core
+    ARCHIVE DESTINATION lib)
+    endif(H2CORE_LIBRARY_TYPE STREQUAL SHARED)
+    #
     # do not copy directory hierarchy
     #PUBLIC_HEADER DESTINATION include/hydrogen
-)
 
 IF(NOT APPPLE AND NOT WIN32)
     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
Index: src/gui/CMakeLists.txt
===================================================================
--- src/gui/CMakeLists.txt.orig	2011-01-06 11:31:10.000000000 +0200
+++ src/gui/CMakeLists.txt	2011-10-08 01:15:00.448239957 +0200
@@ -49,11 +49,11 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(hydrogen WIN32 MACOSX_BUNDLE ${hydrogen_SRCS} ${hydrogen_MOC} ${hydrogen_UIS_H} ${CMAKE_SOURCE_DIR}/windows/icon.rc)
 TARGET_LINK_LIBRARIES(hydrogen
-    hydrogen-core-${VERSION}
+    hydrogen-core
     ${QT_QTGUI_LIBRARY}
     ${QT_QTNETWORK_LIBRARY}
 )
 
-ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(hydrogen hydrogen-core)
 
 INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
Index: src/player/CMakeLists.txt
===================================================================
--- src/player/CMakeLists.txt.orig	2011-01-07 19:29:23.000000000 +0200
+++ src/player/CMakeLists.txt	2011-10-08 01:17:08.357343032 +0200
@@ -9,10 +9,10 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(h2player WIN32 MACOSX_BUNDLE ${h2player_SRCS} )
 TARGET_LINK_LIBRARIES(h2player
-    hydrogen-core-${VERSION}
+    hydrogen-core
     ${QT_QTGUI_LIBRARY}
 )
 
-ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(h2player hydrogen-core)
 
 INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
Index: src/cli/CMakeLists.txt
===================================================================
--- src/cli/CMakeLists.txt.orig	2011-01-07 19:29:23.000000000 +0200
+++ src/cli/CMakeLists.txt	2011-10-08 01:19:05.056788023 +0200
@@ -10,11 +10,11 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(h2cli WIN32 MACOSX_BUNDLE ${h2cli_SRCS} )
 TARGET_LINK_LIBRARIES(h2cli
-    hydrogen-core-${VERSION}
+    hydrogen-core
     ${QT_QTGUI_LIBRARY}
     ${LASH_LIBRARIES}
 )
 
-ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(h2cli hydrogen-core)
 
 INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
Index: src/synth/CMakeLists.txt
===================================================================
--- src/synth/CMakeLists.txt.orig	2011-01-07 19:29:23.000000000 +0200
+++ src/synth/CMakeLists.txt	2011-10-08 01:22:45.011088604 +0200
@@ -9,10 +9,10 @@ INCLUDE_DIRECTORIES(
 
 ADD_EXECUTABLE(h2synth WIN32 MACOSX_BUNDLE ${h2synth_SRCS} )
 TARGET_LINK_LIBRARIES(h2synth
-    hydrogen-core-${VERSION}
+    hydrogen-core
     ${QT_QTGUI_LIBRARY}
 )
 
-ADD_DEPENDENCIES(h2synth hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(h2synth hydrogen-core)
 
 INSTALL(TARGETS h2synth RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
Index: src/tests/CMakeLists.txt
===================================================================
--- src/tests/CMakeLists.txt.orig	2011-01-07 22:38:10.000000000 +0200
+++ src/tests/CMakeLists.txt	2011-10-08 01:20:13.158713653 +0200
@@ -11,8 +11,8 @@ FILE(GLOB_RECURSE TESTS_SRCS *.cpp)
 link_directories()
 add_executable(tests ${TESTS_SRCS})
 target_link_libraries(tests
-    hydrogen-core-${VERSION}
+    hydrogen-core
 	${CPPUNIT_LIBRARIES}
 )
-add_dependencies(tests hydrogen-core-${VERSION})
+add_dependencies(tests hydrogen-core)
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig	2011-09-13 03:35:18.000000000 +0200
+++ CMakeLists.txt	2011-10-09 19:33:45.071516565 +0200
@@ -101,6 +101,7 @@ ELSE()
 
 IF(WANT_SHARED)
     SET(H2CORE_LIBRARY_TYPE SHARED)
+    SET(H2CORE_LIBRARY_SONAME ${coreversion}.${soage}.${sorevision})
 ELSE()
     SET(H2CORE_LIBRARY_TYPE STATIC)
 ENDIF()

Places

File hydrogen-0.9.6-lib64.patch of Package hydrogen (Revision 8216409cd56eb9afff053f68b6fada34)

Places