[t:5094] revert change for #5094 because it doesn't work yet

git-svn-id: file:///svn/toku/tokudb@44672 c7de825b-a66e-492c-adef-691d508d4ae1

CMakeLists.txt

@@ -15,9 +15,6 @@ include(TokuSetupCompiler)
 include(TokuSetupCTest)
 include(TokuThirdParty)
 
-set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(TokuMergeLibs)
-
 ## need a way to change the name of libs we build
 set(LIBTOKUPORTABILITY "tokuportability" CACHE STRING "Name of libtokuportability.so")
 set(LIBTOKUDB "tokudb" CACHE STRING "Name of libtokudb.so")

cmake/merge_archives_unix.cmake.in

-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
-
-# This script merges many static libraries into
-# one big library on Unix.
-SET(TARGET_LOCATION "@TARGET_LOCATION@")
-SET(TARGET "@TARGET@")
-SET(STATIC_LIBS "@STATIC_LIBS@")
-SET(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@")
-SET(CMAKE_AR "@CMAKE_AR@")
-SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
-SET(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
-SET(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
-SET(CMAKE_C_FLAGS "@CMAKE_C_FLAGS@")
-SET(CMAKE_C_FLAGS_DEBUG "@CMAKE_C_FLAGS_DEBUG@")
-SET(CMAKE_C_FLAGS_RELEASE "@CMAKE_C_FLAGS_RELEASE@")
-SET(CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@")
-
-
-SET(TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET})
-MAKE_DIRECTORY(${TEMP_DIR})
-# Extract each archive to its own subdirectory(avoid object filename clashes)
-FOREACH(LIB ${STATIC_LIBS})
-  GET_FILENAME_COMPONENT(NAME_NO_EXT ${LIB} NAME_WE)
-  SET(TEMP_SUBDIR ${TEMP_DIR}/${NAME_NO_EXT})
-  MAKE_DIRECTORY(${TEMP_SUBDIR})
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_AR} -x ${LIB}
-    WORKING_DIRECTORY ${TEMP_SUBDIR}
-  )
-
-  FILE(GLOB_RECURSE LIB_OBJECTS "${TEMP_SUBDIR}/*")
-  SET(OBJECTS ${OBJECTS} ${LIB_OBJECTS})
-ENDFOREACH()
-
-# Use relative paths, makes command line shorter.
-GET_FILENAME_COMPONENT(ABS_TEMP_DIR ${TEMP_DIR} ABSOLUTE)
-FOREACH(OBJ ${OBJECTS})
-  FILE(RELATIVE_PATH OBJ ${ABS_TEMP_DIR} ${OBJ})
-  FILE(TO_NATIVE_PATH ${OBJ} OBJ)
-  SET(ALL_OBJECTS ${ALL_OBJECTS} ${OBJ})
-ENDFOREACH()
-
-SET(TARGET_O ${TARGET}_combined.o)
-IF(CMAKE_BUILD_TYPE STREQUAL Release)
-  SET(flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}")
-  IF(CMAKE_C_COMPILER_ID STREQUAL Intel)
-    SET(flags "${flags} -ipo-c -diag-disable 10015")
-  ENDIF()
-ELSE()
-  SET(flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
-ENDIF()
-IF(CMAKE_C_COMPILER_ID STREQUAL Intel)
-  SET(flags "${flags} -nodefaultlibs -Bstatic -lirc -Bdynamic -lc")
-ENDIF()
-SEPARATE_ARGUMENTS(flags)
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_C_COMPILER} ${flags} -o ${TARGET_O} ${ALL_OBJECTS}
-  WORKING_DIRECTORY ${TEMP_DIR}
-  )
-
-FILE(TO_NATIVE_PATH ${TARGET_LOCATION} ${TARGET_LOCATION})
-# Now pack the objects into library with ar.
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_AR} -r ${TARGET_LOCATION} ${TARGET_O}
-  WORKING_DIRECTORY ${TEMP_DIR}
-)
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_RANLIB} ${TARGET_LOCATION}
-  WORKING_DIRECTORY ${TEMP_DIR}
-)
-
-# Cleanup
-FILE(REMOVE_RECURSE ${TEMP_DIR})
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
-
-# This script merges many static libraries into
-# one big library on Unix.
-SET(TARGET_LOCATION "@TARGET_LOCATION@")
-SET(TARGET "@TARGET@")
-SET(STATIC_LIBS "@STATIC_LIBS@")
-SET(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@")
-SET(CMAKE_AR "@CMAKE_AR@")
-SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
-SET(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
-SET(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
-SET(CMAKE_C_FLAGS "@CMAKE_C_FLAGS@")
-SET(CMAKE_C_FLAGS_DEBUG "@CMAKE_C_FLAGS_DEBUG@")
-SET(CMAKE_C_FLAGS_RELEASE "@CMAKE_C_FLAGS_RELEASE@")
-SET(CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@")
-
-
-SET(TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET})
-MAKE_DIRECTORY(${TEMP_DIR})
-# Extract each archive to its own subdirectory(avoid object filename clashes)
-FOREACH(LIB ${STATIC_LIBS})
-  GET_FILENAME_COMPONENT(NAME_NO_EXT ${LIB} NAME_WE)
-  SET(TEMP_SUBDIR ${TEMP_DIR}/${NAME_NO_EXT})
-  MAKE_DIRECTORY(${TEMP_SUBDIR})
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_AR} -x ${LIB}
-    WORKING_DIRECTORY ${TEMP_SUBDIR}
-  )
-
-  FILE(GLOB_RECURSE LIB_OBJECTS "${TEMP_SUBDIR}/*")
-  SET(OBJECTS ${OBJECTS} ${LIB_OBJECTS})
-ENDFOREACH()
-
-# Use relative paths, makes command line shorter.
-GET_FILENAME_COMPONENT(ABS_TEMP_DIR ${TEMP_DIR} ABSOLUTE)
-FOREACH(OBJ ${OBJECTS})
-  FILE(RELATIVE_PATH OBJ ${ABS_TEMP_DIR} ${OBJ})
-  FILE(TO_NATIVE_PATH ${OBJ} OBJ)
-  SET(ALL_OBJECTS ${ALL_OBJECTS} ${OBJ})
-ENDFOREACH()
-
-SET(TARGET_O ${TARGET}_combined.o)
-IF(CMAKE_BUILD_TYPE STREQUAL Release)
-  SET(flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}")
-  IF(CMAKE_C_COMPILER_ID STREQUAL Intel)
-    SET(flags "${flags} -ipo-c -diag-disable 10015")
-  ENDIF()
-ELSE()
-  SET(flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
-ENDIF()
-IF(CMAKE_C_COMPILER_ID STREQUAL Intel)
-  SET(flags "${flags} -nodefaultlibs -Bstatic -lirc -Bdynamic -lc")
-ENDIF()
-SEPARATE_ARGUMENTS(flags)
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_C_COMPILER} ${flags} -o ${TARGET_O} ${ALL_OBJECTS}
-  WORKING_DIRECTORY ${TEMP_DIR}
-  )
-
-FILE(TO_NATIVE_PATH ${TARGET_LOCATION} ${TARGET_LOCATION})
-# Now pack the objects into library with ar.
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_AR} -r ${TARGET_LOCATION} ${TARGET_O}
-  WORKING_DIRECTORY ${TEMP_DIR}
-)
-EXECUTE_PROCESS(
-  COMMAND ${CMAKE_RANLIB} ${TARGET_LOCATION}
-  WORKING_DIRECTORY ${TEMP_DIR}
-)
-
-# Cleanup
-FILE(REMOVE_RECURSE ${TEMP_DIR})

cmake_modules/TokuMergeLibs.cmake

-# Merge static libraries into a big static lib. The resulting library 
-# should not not have dependencies on other static libraries.
-# We use it in MySQL to merge mysys,dbug,vio etc into mysqlclient
-
-MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
-  # To produce a library we need at least one source file.
-  # It is created by ADD_CUSTOM_COMMAND below and will helps 
-  # also help to track dependencies.
-  SET(SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_depends.c)
-  ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
-  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
-
-  SET(OSLIBS)
-  FOREACH(LIB ${LIBS_TO_MERGE})
-    GET_TARGET_PROPERTY(LIB_LOCATION ${LIB} LOCATION)
-    GET_TARGET_PROPERTY(LIB_TYPE ${LIB} TYPE)
-    IF(NOT LIB_LOCATION)
-       # 3rd party library like libz.so. Make sure that everything
-       # that links to our library links to this one as well.
-       LIST(APPEND OSLIBS ${LIB})
-    ELSE()
-      # This is a target in current project
-      # (can be a static or shared lib)
-      IF(LIB_TYPE STREQUAL "STATIC_LIBRARY")
-        SET(STATIC_LIBS ${STATIC_LIBS} ${LIB_LOCATION})
-        ADD_DEPENDENCIES(${TARGET} ${LIB})
-        # Extract dependend OS libraries
-        #GET_DEPENDEND_OS_LIBS(${LIB} LIB_OSLIBS)
-        #LIST(APPEND OSLIBS ${LIB_OSLIBS})
-      ELSE()
-        # This is a shared library our static lib depends on.
-        LIST(APPEND OSLIBS ${LIB})
-      ENDIF()
-    ENDIF()
-  ENDFOREACH()
-  IF(OSLIBS)
-    LIST(REMOVE_DUPLICATES OSLIBS)
-    TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
-  ENDIF()
-
-  # Make the generated dummy source file depended on all static input
-  # libs. If input lib changes,the source file is touched
-  # which causes the desired effect (relink).
-  ADD_CUSTOM_COMMAND( 
-    OUTPUT  ${SOURCE_FILE}
-    COMMAND ${CMAKE_COMMAND}  -E touch ${SOURCE_FILE}
-    DEPENDS ${STATIC_LIBS})
-
-  IF(MSVC)
-    # To merge libs, just pass them to lib.exe command line.
-    SET(LINKER_EXTRA_FLAGS "")
-    FOREACH(LIB ${STATIC_LIBS})
-      SET(LINKER_EXTRA_FLAGS "${LINKER_EXTRA_FLAGS} ${LIB}")
-    ENDFOREACH()
-    SET_TARGET_PROPERTIES(${TARGET} PROPERTIES STATIC_LIBRARY_FLAGS 
-      "${LINKER_EXTRA_FLAGS}")
-  ELSE()
-    GET_TARGET_PROPERTY(TARGET_LOCATION ${TARGET} LOCATION)  
-    IF(APPLE)
-      # Use OSX's libtool to merge archives (ihandles universal 
-      # binaries properly)
-      ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
-        COMMAND rm ${TARGET_LOCATION}
-        COMMAND /usr/bin/libtool -static -o ${TARGET_LOCATION} 
-        ${STATIC_LIBS}
-      )  
-    ELSE()
-      # Generic Unix, Cygwin or MinGW. In post-build step, call
-      # script, that extracts objects from archives with "ar x" 
-      # and repacks them with "ar r"
-      SET(TARGET ${TARGET})
-      CONFIGURE_FILE(
-        ${TOKU_CMAKE_SCRIPT_DIR}/merge_archives_unix.cmake.in
-        ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET}.cmake 
-        @ONLY
-      )
-      ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
-        COMMAND rm ${TARGET_LOCATION}
-        COMMAND ${CMAKE_COMMAND} -P 
-        ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET}.cmake
-      )
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-# Merge static libraries into a big static lib. The resulting library 
-# should not not have dependencies on other static libraries.
-# We use it in MySQL to merge mysys,dbug,vio etc into mysqlclient
-
-MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
-  # To produce a library we need at least one source file.
-  # It is created by ADD_CUSTOM_COMMAND below and will helps 
-  # also help to track dependencies.
-  SET(SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_depends.c)
-  ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
-  SET_TARGET_PROPERTIES(${TARGET} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
-
-  SET(OSLIBS)
-  FOREACH(LIB ${LIBS_TO_MERGE})
-    GET_TARGET_PROPERTY(LIB_LOCATION ${LIB} LOCATION)
-    GET_TARGET_PROPERTY(LIB_TYPE ${LIB} TYPE)
-    IF(NOT LIB_LOCATION)
-       # 3rd party library like libz.so. Make sure that everything
-       # that links to our library links to this one as well.
-       LIST(APPEND OSLIBS ${LIB})
-    ELSE()
-      # This is a target in current project
-      # (can be a static or shared lib)
-      IF(LIB_TYPE STREQUAL "STATIC_LIBRARY")
-        SET(STATIC_LIBS ${STATIC_LIBS} ${LIB_LOCATION})
-        ADD_DEPENDENCIES(${TARGET} ${LIB})
-        # Extract dependend OS libraries
-        #GET_DEPENDEND_OS_LIBS(${LIB} LIB_OSLIBS)
-        #LIST(APPEND OSLIBS ${LIB_OSLIBS})
-      ELSE()
-        # This is a shared library our static lib depends on.
-        LIST(APPEND OSLIBS ${LIB})
-      ENDIF()
-    ENDIF()
-  ENDFOREACH()
-  IF(OSLIBS)
-    LIST(REMOVE_DUPLICATES OSLIBS)
-    TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
-  ENDIF()
-
-  # Make the generated dummy source file depended on all static input
-  # libs. If input lib changes,the source file is touched
-  # which causes the desired effect (relink).
-  ADD_CUSTOM_COMMAND( 
-    OUTPUT  ${SOURCE_FILE}
-    COMMAND ${CMAKE_COMMAND}  -E touch ${SOURCE_FILE}
-    DEPENDS ${STATIC_LIBS})
-
-  IF(MSVC)
-    # To merge libs, just pass them to lib.exe command line.
-    SET(LINKER_EXTRA_FLAGS "")
-    FOREACH(LIB ${STATIC_LIBS})
-      SET(LINKER_EXTRA_FLAGS "${LINKER_EXTRA_FLAGS} ${LIB}")
-    ENDFOREACH()
-    SET_TARGET_PROPERTIES(${TARGET} PROPERTIES STATIC_LIBRARY_FLAGS 
-      "${LINKER_EXTRA_FLAGS}")
-  ELSE()
-    GET_TARGET_PROPERTY(TARGET_LOCATION ${TARGET} LOCATION)  
-    IF(APPLE)
-      # Use OSX's libtool to merge archives (ihandles universal 
-      # binaries properly)
-      ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
-        COMMAND rm ${TARGET_LOCATION}
-        COMMAND /usr/bin/libtool -static -o ${TARGET_LOCATION} 
-        ${STATIC_LIBS}
-      )  
-    ELSE()
-      # Generic Unix, Cygwin or MinGW. In post-build step, call
-      # script, that extracts objects from archives with "ar x" 
-      # and repacks them with "ar r"
-      SET(TARGET ${TARGET})
-      CONFIGURE_FILE(
-        ${TOKU_CMAKE_SCRIPT_DIR}/merge_archives_unix.cmake.in
-        ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET}.cmake 
-        @ONLY
-      )
-      ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
-        COMMAND rm ${TARGET_LOCATION}
-        COMMAND ${CMAKE_COMMAND} -P 
-        ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET}.cmake
-      )
-    ENDIF()
-  ENDIF()
-ENDMACRO()

src/CMakeLists.txt

@@ -25,13 +25,14 @@ target_link_libraries(${LIBTOKUDB} LINK_PRIVATE lock_tree_static range_tree_stat
 target_link_libraries(${LIBTOKUDB} LINK_PUBLIC z)
 
 ## make the static library
-add_library(tokudb_static_conv STATIC ${tokudb_srcs})
-add_dependencies(tokudb_static_conv install_tdb_h)
-add_space_separated_property(TARGET tokudb_static_conv COMPILE_FLAGS -fPIC)
-merge_static_libs(${LIBTOKUDB}_static ${LIBTOKUDB}_static tokudb_static_conv lock_tree_static range_tree_static ft_static lzma)
+add_library(${LIBTOKUDB}_static STATIC ${tokudb_srcs})
+add_dependencies(${LIBTOKUDB}_static install_tdb_h)
+add_space_separated_property(TARGET ${LIBTOKUDB}_static COMPILE_FLAGS -fPIC)
+target_link_libraries(${LIBTOKUDB}_static LINK_PRIVATE lock_tree_static range_tree_static ft_static)
 
 if (CMAKE_C_COMPILER_ID STREQUAL Intel)
   target_link_libraries(${LIBTOKUDB} LINK_PRIVATE -nodefaultlibs)
+  target_link_libraries(${LIBTOKUDB}_static LINK_PRIVATE -nodefaultlibs)
 endif ()
 
 ## add a version script and set -fvisibility=hidden for the shared library
@@ -42,13 +43,13 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
 endif ()
 
 ## add gcov and define _GNU_SOURCE
-maybe_add_gcov_to_libraries(${LIBTOKUDB} tokudb_static_conv)
-set_property(TARGET ${LIBTOKUDB} tokudb_static_conv APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
+maybe_add_gcov_to_libraries(${LIBTOKUDB} ${LIBTOKUDB}_static)
+set_property(TARGET ${LIBTOKUDB} ${LIBTOKUDB}_static APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
 
 set_targets_need_intel_libs(${LIBTOKUDB})
 
 install(
-  TARGETS ${LIBTOKUDB} ${LIBTOKUDB}_static
+  TARGETS ${LIBTOKUDB}
   DESTINATION lib
   )