[t:4846] merging 4846 branch.

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

[t:4846] merging 4846 branch.
git-svn-id: file:///svn/toku/tokudb@43235 c7de825b-a66e-492c-adef-691d508d4ae1
17c641b6 · Leif Walsh · Yoni Fogel · 5a3d586b · 17c641b6
Commit 17c641b6 authored Apr 17, 2013 by Leif Walsh Committed by Yoni Fogel Apr 17, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cmake_modules/TokuSetupCompiler.cmake cmake_modules/TokuSetupCompiler.cmake +4 -2

No files found.
--- a/cmake_modules/TokuSetupCompiler.cmake
+++ b/cmake_modules/TokuSetupCompiler.cmake
@@ -103,6 +103,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "^Intel$")
  string(REGEX REPLACE ";" "," intel_warning_string "${intel_warnings}")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-disable ${intel_warning_string}")

-  # make sure to link with both intel's math library and regular -lm
-  link_libraries(imf m)
+  # make sure intel libs are linked statically
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-intel")
 endif()