Changeset 3113 for trunk

Timestamp:

02/08/17 21:07:11 (8 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-9626)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build asap

Put in Release Notes: No

Module(s): asap

Description: Applied a patch received from Darrell to set appropriate build flags for intel Mac.

File:

• trunk/CMakeLists.txt (modified) (4 diffs)

trunk/CMakeLists.txt

@@ -68 +68 @@
    add_definitions( -DAIPS_DEBUG )
 endif()
-set( CMAKE_CXX_FLAGS_DEBUG "-ggdb3 -O0 -fno-omit-frame-pointer" )
+set( CMAKE_CXX_FLAGS_DEBUG " -O0" )
+if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+   set( CMAKE_CXX_FLAGS_DEBUG "-ggdb3 -fno-omit-frame-pointer" )
+endif( )
 
 # flags for Profile build
@@ -104 +107 @@
 # default flags
 if( APPLE )
-    set( DEFAULT_CXX_FLAGS "-pipe -Wall -Wextra -Wcast-align -Wno-comment" )
+    set( DEFAULT_CXX_FLAGS "-pipe -Wall -Wextra -Wno-comment" )
 else ()
-    set( DEFAULT_CXX_FLAGS "-pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment" )
-endif()
+    set( DEFAULT_CXX_FLAGS "-pipe -Wall -Wextra -Wno-comment" )
+endif()
+if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -Wcast-align" )
+    if (NOT APPLE)
+        set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -Wno-non-template-friend" )
+    endif( )
+endif( )
 
 # additional flag for fortran complex div/mul rules.
@@ -131 +140 @@
 endif()
 
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+   ## setting intel libraries with e.g.
+   ##
+   ##    find_library( INTEL_IRNG irng HINTS ${INTEL_PATH} )
+   ##
+   ## causes CMAKE to substitute fully qualified paths which makes
+   ## python shared object unrelocatable in the case of libirng.so
+   ##
+   get_filename_component(INTEL_PATH ${CMAKE_CXX_COMPILER} DIRECTORY)
+   set(INTEL_LIB_PATH ${INTEL_PATH}/../lib/intel64)
+   set(INTEL_LIBS -limf -lsvml -lirng -lintlc -lifport -lifcore -liomp5)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,${INTEL_LIB_PATH}")
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath,${INTEL_LIB_PATH}")
+endif()
+
 find_package( OpenMP )
 if( OPENMP_FOUND )
-   set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
+   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+      set(DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -qopenmp")
+   else( )
+      set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
+   endif( )
 endif()
 
@@ -606 +634 @@
         set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined -Wl,error -framework AppKit" )
      else()
-        set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined -Wl,error" )
+        set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,error" )
      endif()
   endif()