[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/strigi-chemical
From:       Egon Willighagen <e.willighagen () science ! ru ! nl>
Date:       2010-08-14 8:38:21
Message-ID: 20100814083821.48AE1AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1163518 by egonw:

Updated for Strigi 0.7.0

 M  +5 -0      CMakeLists.txt  
 M  +4 -0      ChangeLog  
 M  +1 -2      src/inchi-generator/CMakeLists.txt  
 M  +10 -2     src/openbabel-helper/CMakeLists.txt  


--- trunk/playground/utils/strigi-chemical/CMakeLists.txt #1163517:1163518
@@ -1,5 +1,10 @@
 PROJECT(strigi-chemical)
 
+set(STRIGI_CHEMICAL_VERSION_MAJOR 0 CACHE INT "Major Strigi-Chemical version number" \
FORCE) +set(STRIGI_CHEMICAL_VERSION_MINOR 15 CACHE INT "Minor Strigi-Chemical version \
number" FORCE) +set(STRIGI_CHEMICAL_VERSION_PATCH 0 CACHE INT "Release \
Strigi-Chemical version number" FORCE) +set(STRIGI_CHEMICAL_VERSION_STRING \
"${STRIGI_CHEMICAL_VERSION_MAJOR}.${STRIGI_CHEMICAL_VERSION_MINOR}.${STRIGI_CHEMICAL_VERSION_PATCH}" \
CACHE STRING "Strigi-Chemical version string" FORCE) +
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # Depend on CMake 2.4.5 or better
--- trunk/playground/utils/strigi-chemical/ChangeLog #1163517:1163518
@@ -1,3 +1,7 @@
+0.15.0
+------------------------
+* Updated for Strigi 0.7.0
+
 0.14
 ------------------------
 * Strigi support
--- trunk/playground/utils/strigi-chemical/src/inchi-generator/CMakeLists.txt \
#1163517:1163518 @@ -4,8 +4,7 @@
 ADD_LIBRARY(inchigen MODULE inchigenthroughanalyzer.cpp)
 
 #TARGET_LINK_LIBRARIES(inchigen ${STRIGI_STREAMANALYZER_LIBRARY} openbabel-helper)
-TARGET_LINK_LIBRARIES(inchigen ${STRIGI_STREAMANALYZER_LIBRARY})
-TARGET_LINK_LIBRARIES(inchigen openbabelhelper)
+TARGET_LINK_LIBRARIES(inchigen ${STRIGI_STREAMANALYZER_LIBRARY} openbabelhelper)
 
 SET_TARGET_PROPERTIES(inchigen PROPERTIES PREFIX strigita_)
 
--- trunk/playground/utils/strigi-chemical/src/openbabel-helper/CMakeLists.txt \
#1163517:1163518 @@ -2,6 +2,14 @@
 
 SET(CMAKE_CXX_FLAGS "-fexceptions -fPIC")
 
-ADD_LIBRARY(openbabelhelper STATIC openbabelhelper.cpp)
+ADD_LIBRARY(openbabelhelper SHARED openbabelhelper.cpp)
 
-INSTALL(TARGETS openbabelhelper ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+SET_TARGET_PROPERTIES(openbabelhelper PROPERTIES
+    VERSION ${STRIGI_CHEMICAL_VERSION_STRING}
+    SOVERSION ${STRIGI_CHEMICAL_VERSION_MAJOR} DEFINE_SYMBOL MAKE_STREAMANALYZER_LIB
+)
+
+#TARGET_LINK_LIBRARIES(openbabelhelper openbabel)
+
+INSTALL(TARGETS openbabelhelper ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                                LIBRARY DESTINATION ${LIB_INSTALL_DIR})


[prev in list] [next in list] [prev in thread] [next in thread]