[t:4846] merging 4846 branch.

git-svn-id: file:///svn/toku/tokudb@43235 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Leif Walsh 2013-04-17 00:00:26 -04:00 committed by Yoni Fogel
parent 5a3d586ba6
commit 17c641b674

View file

@ -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()