Use same config for executables.

egorpugin · egorpugin · commit 1119526043fc · 2018-07-12T17:14:18.000+03:00
diff --git a/src/inserts/functions.cmake b/src/inserts/functions.cmake
@@ -353,9 +353,9 @@ endfunction(get_configuration_with_generator_unhashed)
 ########################################
 
 function(get_configuration_exe_unhashed out)
-    #get_configuration_unhashed(config)
-    #set(${out} ${config} PARENT_SCOPE)
-    #return()
+    get_configuration_unhashed(config)
+    set(${out} ${config} PARENT_SCOPE)
+    return()
 
     prepare_config_part(system "${CMAKE_SYSTEM_NAME}")
     prepare_config_part(processor "${CMAKE_HOST_SYSTEM_PROCESSOR}")
diff --git a/src/inserts/generate.cmake b/src/inserts/generate.cmake
@@ -8,7 +8,7 @@ endif()
 # CPPAN_BUILD_SHARED_LIBS has influence on config vars
 if (EXECUTABLE)
     # TODO: try to work 0->1 <- why? maybe left as is?
-    set(CPPAN_BUILD_SHARED_LIBS 0)
+    #set(CPPAN_BUILD_SHARED_LIBS 0)
 endif()
 
 # after all settings
@@ -80,6 +80,7 @@ if (NOT EXISTS ${import} OR
                 # TODO: fix executables bootstrapping
                 # BUG: copying bad cmake config dirs (32 - 64 bits)
                 #set(from ${storage_dir_cfg}/${config_dir}/CMakeFiles/${CMAKE_VERSION})
+                set(from ${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION})
             else()
                 set(from ${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION})
             endif()
