Static linking works now (Fixes #934)

CMakeLists.txt

@@ -146,6 +146,7 @@ hpx_option(WITH_STATIC_LINKING BOOL
 if(WITH_STATIC_LINKING)
   hpx_add_config_define(HPX_STATIC_LINKING)
   set(hpx_library_link_mode STATIC)
+  set(CMAKE_SHARED_LIBS OFF)
 else()
   set(hpx_library_link_mode SHARED)
 endif()
@@ -157,6 +158,7 @@ hpx_option(WITH_TESTS BOOL "Build the HPX tests (default ON)" ON)
 hpx_option(WITH_TESTS_BENCHMARKS BOOL "Build HPX benchmark tests (default: ON)" ON ADVANCED)
 hpx_option(WITH_TESTS_REGRESSIONS BOOL "Build HPX regression tests (default: ON)" ON ADVANCED)
 hpx_option(WITH_TESTS_UNIT BOOL "Build HPX unit tests (default: ON)" ON ADVANCED)
+hpx_option(WITH_TOOLS BOOL "Build HPX tools (default: OFF)" OFF ADVANCED)
 hpx_option(WITH_RUNTIME BOOL "Build HPX runtime (default: ON)" ON ADVANCED)
 
 hpx_option(WITH_FULL_RPATH BOOL "Build and link HPX libraries and executables with full RPATHs (default: ON)" ON ADVANCED)
@@ -1138,9 +1140,8 @@ set(HPX_DEBUG_POSTFIX "d")
 # executable to run. The same process will walk through the project's entire
 # directory structure.
 
-hpx_option(HPX_BUILD_TOOLS BOOL "Build HPX tools (default: OFF)" OFF ADVANCED)
 
-if(HPX_BUILD_TOOLS OR HPX_STATIC_LINKING)
+if(WITH_TOOLS)
   add_hpx_pseudo_target(tools)
   add_subdirectory(tools)
 endif()
@@ -1187,13 +1188,6 @@ if(WITH_RUNTIME)
   add_subdirectory(runtime)
 endif()
 
-# hpx_option(HPX_BUILD_TOOLS BOOL "Build HPX tools (default: OFF)" OFF ADVANCED)
-#
-# if(HPX_BUILD_TOOLS)
-#   add_hpx_pseudo_target(tools)
-#   add_subdirectory(tools)
-# endif()
-
 if(WITH_DOCUMENTATION)
   add_subdirectory(docs)
 endif()

cmake/HPX_AddComponent.cmake

@@ -101,7 +101,7 @@ macro(add_hpx_component name)
   if(${name}_EXCLUDE_FROM_ALL)
     set(exclude_from_all EXCLUDE_FROM_ALL)
   else()
-    if(${name}_PLUGIN AND NOT WITH_STATIC_BUILD)
+    if(${name}_PLUGIN AND NOT WITH_STATIC_LINKING)
       set(install_destination lib/hpx)
       set(${name}_OUTPUT_SUFFIX lib/hpx)
     else()
@@ -120,7 +120,7 @@ macro(add_hpx_component name)
   if(${${name}_STATIC})
     set(${name}_lib_linktype STATIC)
   else()
-    if(WITH_STATIC_BUILD)
+    if(WITH_STATIC_LINKING)
       set(${name}_lib_linktype STATIC)
     else()
       set(${name}_lib_linktype SHARED)

cmake/HPX_AddLibrary.cmake

@@ -88,12 +88,11 @@ macro(add_hpx_library name)
 
   set(exclude_from_all)
   set(install_options)
-  if(${name}_EXCLUDE_FROM_ALL)
 
-  if(NOT HPX_EXTERNAL_CMAKE)
+  if(${name}_EXCLUDE_FROM_ALL)
     set(exclude_from_all EXCLUDE_FROM_ALL)
   else()
-    if(${name}_PLUGIN AND NOT WITH_STATIC_BUILD)
+    if(${name}_PLUGIN AND NOT WITH_STATIC_LINKING)
       set(install_destination lib/hpx)
       set(${name}_OUTPUT_SUFFIX lib/hpx)
     else()
@@ -116,7 +115,7 @@ macro(add_hpx_library name)
   if(${${name}_STATIC})
     set(${name}_lib_linktype STATIC)
   else()
-    if(WITH_STATIC_BUILD)
+    if(WITH_STATIC_LINKING)
       set(${name}_lib_linktype STATIC)
     else()
       set(${name}_lib_linktype SHARED)

cmake/HPX_SetupBoost.cmake

@@ -5,6 +5,9 @@
 
 # We first try to find the required minimum set of Boost libraries. This will
 # also give us the version of the found boost installation
+if(WITH_STATIC_LINKING)
+  set(Boost_USE_STATIC_LIBS ON)
+endif()
 find_package(Boost
   1.49
   REQUIRED

cmake/HPX_SetupTarget.cmake

@@ -111,10 +111,10 @@ function(hpx_setup_target target)
 
   # linker instructions
   if(NOT target_NOLIBS)
-    set(hpx_libs hpx hpx_serialization)
-    if(NOT nohpxinit)
-      set(hpx_libs ${hpx_libs} hpx_init)
-    endif()
+    set(hpx_libs hpx)# hpx_serialization)
+#    if(NOT nohpxinit)
+#      set(hpx_libs ${hpx_libs} hpx_init)
+#    endif()
     hpx_handle_component_dependencies(target_COMPONENT_DEPENDENCIES)
     set(hpx_libs ${hpx_libs} ${target_COMPONENT_DEPENDENCIES})
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")