CMakeList diff

diff

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9460024..aa82dae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_subdirectory(components)
 
-foreach(lib "hpx hpx_serialization")
+foreach(lib "hpx")
   set(${lib}_SOURCES "" CACHE INTERNAL "Sources for lib${lib}." FORCE)
 
   if(MSVC)
@@ -17,13 +17,6 @@ endforeach()
 ################################################################################
 # gather sources
 
-# libhpx_serialization sources
-add_hpx_library_sources(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/src/util/*_binary_*archive.cpp")
-add_hpx_library_sources(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/src/serialization/*.cpp"
-  APPEND)
-
 # libhpx sources
 add_hpx_library_sources(hpx
   GLOB GLOBS "${hpx_SOURCE_DIR}/src/*.cpp"
@@ -39,7 +32,6 @@ add_hpx_library_sources(hpx
   APPEND)
 add_hpx_library_sources(hpx
   GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/src/util/*.cpp"
-  EXCLUDE ".*_binary_.*archive[.]cpp"
   APPEND)
 add_hpx_library_sources(hpx
   GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/src/lcos/*.cpp"
@@ -81,17 +73,9 @@ endif()
 # gather headers
 
 # libhpx_serialization headers
-add_hpx_library_headers(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/hpx/util/*_binary_*.hpp")
-add_hpx_library_headers(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/hpx/serialization/*.hpp"
-  APPEND)
-add_hpx_library_headers(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/hpx/util/ichunk_manager.hpp"
-  APPEND)
-add_hpx_library_headers(hpx_serialization
-  GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/hpx/util/ochunk_manager.hpp"
-  APPEND)
+#add_hpx_library_headers(hpx_serialization
+  #GLOB_RECURSE GLOBS "${hpx_SOURCE_DIR}/hpx/serialization/*.hpp"
+  #APPEND)
 
 # libhpx headers
 add_hpx_library_headers(hpx
@@ -141,17 +125,17 @@ add_hpx_library_headers(hpx_init
 
 ################################################################################
 # make source groups
-add_hpx_source_group(
-  NAME hpx_serialization
-  CLASS "Source Files"
-  ROOT "${hpx_SOURCE_DIR}/src/util"
-  TARGETS ${hpx_serialization_SOURCES})
-
-add_hpx_source_group(
-  NAME hpx_serialization
-  CLASS "Header Files"
-  ROOT "${hpx_SOURCE_DIR}/hpx/util"
-  TARGETS ${hpx_serialization_HEADERS})
+#add_hpx_source_group(
+  #NAME hpx_serialization
+  #CLASS "Source Files"
+  #ROOT "${hpx_SOURCE_DIR}/src/util"
+  #TARGETS ${hpx_serialization_SOURCES})
+
+#add_hpx_source_group(
+  #NAME hpx_serialization
+  #CLASS "Header Files"
+  #ROOT "${hpx_SOURCE_DIR}/hpx/util"
+  #TARGETS ${hpx_serialization_HEADERS})
 
 add_hpx_source_group(
   NAME hpx CLASS "Source Files"
@@ -182,58 +166,9 @@ add_hpx_source_group(
   TARGETS ${hpx_init_HEADERS})
 
 ################################################################################
-# libhpx_serialization
-if(NOT HPX_STATIC_LINKING)
-  if(MSVC)
-    # The MSVC linker can't handle a static library as large as we get when
-    # statically linking the main HPX library.
-    set(hpx_library_link_mode_core SHARED)
-  else()
-    set(hpx_library_link_mode_core ${hpx_library_link_mode})
-  endif()
-
-  if(HPX_BUILD_DEFAULT_TARGETS)
-    add_library(hpx_serialization ${hpx_library_link_mode_core}
-      ${hpx_serialization_SOURCES} ${hpx_serialization_HEADERS})
-  else()
-    add_library(hpx_serialization ${hpx_library_link_mode_core} EXCLUDE_FROM_ALL
-      ${hpx_serialization_SOURCES} ${hpx_serialization_HEADERS})
-  endif()
-
-  set_target_properties(hpx_serialization PROPERTIES
-    VERSION ${HPX_LIBRARY_VERSION}
-    SOVERSION ${HPX_SOVERSION}
-    CLEAN_DIRECT_OUTPUT 1
-    OUTPUT_NAME hpx_serialization
-    FOLDER "Core")
-
-  set(hpx_serialization_lib_dependencies
-    ${hpx_MALLOC_LIBRARY})
-
-  if(NOT MSVC)
-    set(hpx_serialization_lib_dependencies
-        ${hpx_serialization_lib_dependencies}
-        debug ${Boost_SYSTEM_LIBRARY_DEBUG}
-        optimized ${Boost_SYSTEM_LIBRARY_RELEASE}
-        debug ${Boost_SERIALIZATION_LIBRARY_DEBUG}
-        optimized ${Boost_SERIALIZATION_LIBRARY_DEBUG})
-  endif()
-
-  target_link_libraries(hpx_serialization
-    ${hpx_serialization_lib_dependencies})
-
-  set_property(TARGET hpx_serialization APPEND
-    PROPERTY COMPILE_DEFINITIONS
-    "HPX_EXPORTS"
-    "HPX_SERIALIZATION_EXPORTS"
-    "HPX_COROUTINE_EXPORTS")
-  set(hpx_targets ${hpx_targets} hpx_serialization)
-endif()
-
-################################################################################
 # libhpx
 if(HPX_STATIC_LINKING)
-  set(hpx_SOURCES ${hpx_SOURCES} ${hpx_serialization_SOURCES} ${hpx_init_SOURCES})
+  set(hpx_SOURCES ${hpx_SOURCES} {hpx_init_SOURCES})
 endif()
 if(HPX_BUILD_DEFAULT_TARGETS)
   add_library(hpx ${hpx_library_link_mode_core}
@@ -261,14 +196,14 @@ else()
     FOLDER "Core")
 endif()
 
-if(HPX_STATIC_LINKING)
-  target_link_libraries(hpx
-    ${HPX_LIBRARIES})
-else()
-  target_link_libraries(hpx
-    hpx_serialization
-    ${HPX_LIBRARIES})
-endif()
+#if(HPX_STATIC_LINKING)
+target_link_libraries(hpx
+  ${HPX_LIBRARIES})
+#else()
+  #target_link_libraries(hpx
+    #hpx_serialization
+    #${HPX_LIBRARIES})
+#endif()
 
 set_property(TARGET hpx APPEND
   PROPERTY COMPILE_DEFINITIONS