Chris Hillery has proposed merging lp:~zorba-coders/zorba/fix-unversioned-modules into lp:zorba.
Requested reviews: Dennis Knochenwefel (dennis-knochenwefel) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-unversioned-modules/+merge/90600 -- https://code.launchpad.net/~zorba-coders/zorba/fix-unversioned-modules/+merge/90600 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog' --- ChangeLog 2012-01-26 22:26:04 +0000 +++ ChangeLog 2012-01-29 10:10:29 +0000 @@ -31,6 +31,7 @@ * Deprecated StaticContext:getNamespaceURIByPrefix() * Fixed bug #918211 (xqueryx fulltext w3c conformance generation) * Fixed bug #918157 (Add XQFTTS to validation queue) + * Fixed bug with unversioned modules with C++ external functions version 2.1 === modified file 'cmake_modules/ZorbaModule.cmake' --- cmake_modules/ZorbaModule.cmake 2011-12-21 14:40:33 +0000 +++ cmake_modules/ZorbaModule.cmake 2012-01-29 10:10:29 +0000 @@ -250,6 +250,11 @@ SET(module_lib_target "modlib${num_zorba_modules}_${module_name}") ADD_LIBRARY(${module_lib_target} SHARED ${SRC_FILES}) GET_FILENAME_COMPONENT(module_filewe "${module_filename}" NAME_WE) + IF (MODULE_VERSION) + # If there's a version, insert it into the module library name + SET (module_filewe "${module_filewe}_${MODULE_VERSION}") + ENDIF (MODULE_VERSION) + # It seems like it would be nice to set the VERSION and/or # SOVERSION target properties here. However: On Windows, it # doesn't seem to do anything (the .rc file configured above @@ -260,7 +265,7 @@ # target property isn't desirable. # FOLDER is to group IDE projects into folders. SET_TARGET_PROPERTIES (${module_lib_target} PROPERTIES - OUTPUT_NAME "${module_filewe}_${MODULE_VERSION}${SUFFIX}" + OUTPUT_NAME "${module_filewe}${SUFFIX}" ${target_type}_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module_name}.src" FOLDER "Modules" )
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp