Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
25701183
Commit
25701183
authored
Jun 02, 2014
by
Olivier Coulaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pb with Intel 15.0
parent
183feec3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
11 deletions
+14
-11
CMakeLists.txt
CMakeLists.txt
+14
-11
No files found.
CMakeLists.txt
View file @
25701183
...
...
@@ -176,11 +176,12 @@ endif(ScalFMM_USE_FFT)
#
# C++ 2011
#ADD_DEFINITIONS(-std=c++11)
IF
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Intel"
AND APPLE
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpversion OUTPUT_VARIABLE INTEL_VERSION
)
string
(
FIND
${
CMAKE_CXX_COMPILER
}
"icl++"
NAME
)
MESSAGE
(
"CMAKE_SYSTEM:
${
CMAKE_SYSTEM
}
CMAKE_CXX_COMPILER_ID
${
CMAKE_CXX_COMPILER_ID
}
CMAKE_CXX_COMPILER
${
NAME
}
"
)
IF
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Intel"
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpversion OUTPUT_VARIABLE INTEL_VERSION
)
MESSAGE
(
"Intel:
${
INTEL_VERSION
}
"
)
IF
(
APPLE
)
string
(
FIND
${
CMAKE_CXX_COMPILER
}
"icl++"
NAME
)
if
(
${
NAME
}
GREATER 0
)
if
(
${
INTEL_VERSION
}
EQUAL 15. OR
${
INTEL_VERSION
}
GREATER 15.0.0
)
MESSAGE
(
" Intel compiler is icl++ ( version >= 15.0.0)"
)
...
...
@@ -190,6 +191,7 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND APPLE)
else
()
MESSAGE
(
FATAL_ERROR
" Intel compiler should be icl++ ( version >= 15.0.0)"
)
endif
()
endif
()
endif
()
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/Src/ScalFmmConfig.h.cmake
...
...
@@ -213,10 +215,10 @@ if( ScalFMM_USE_SSE )
IF
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Intel"
)
# Set flag for old intel compiler TODO
MESSAGE
(
STATUS
"INTEL COMPILER IS
${
INTEL_VERSION
}
"
)
if
(
${
INTEL_VERSION
}
LESS
"15.0.0"
)
#
if( ${INTEL_VERSION} LESS "15.0.0")
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D__OLD_INTEL_COMPILER"
)
MESSAGE
(
STATUS
"INTEL COMPILER LOWER 15.0.0"
)
ENDIF
()
#
ENDIF()
ELSE
()
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-msse -msse2 -msse3 -mfpmath=sse"
)
ENDIF
()
...
...
@@ -322,6 +324,7 @@ INSTALL(FILES
# build a CPack driven installer package
#
# Use git commit number as CPACK_PACKAGE_VERSION_PATCH
set
(
CPACK_PACKAGE_VERSION_PATCH 0
)
execute_process
(
COMMAND git rev-list HEAD --count
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment