diff options
| author | Allen Winter <winter@kde.org> | 2006-05-16 16:11:04 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2006-05-16 16:11:04 +0000 |
| commit | 0a4c9a0fd6ddf1031be60510530f9d23838cdd81 (patch) | |
| tree | d96b1e9195bcae4b7c22bc618cde1d094bf4473a | |
| parent | bd90de050a89ae64b0f38b2f263d8d00196988ec (diff) | |
| download | extra-cmake-modules-0a4c9a0fd6ddf1031be60510530f9d23838cdd81.tar.gz extra-cmake-modules-0a4c9a0fd6ddf1031be60510530f9d23838cdd81.tar.bz2 | |
more work to get the Intel compilers fully supported. still not all the way done,
but getting closer.
svn path=/trunk/KDE/kdelibs/; revision=541571
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 5fe2dca0..e2490b0e 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -557,10 +557,8 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux) endif (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_C_COMPILER MATCHES "icc") set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) -# set ( CMAKE_SHARED_LINKER_FLAGS "-Qoption,ld,--fatal-warnings --no-undefined -lc") -# set ( CMAKE_MODULE_LINKER_FLAGS "-Qoption,ld,--fatal-warnings --no-undefined -lc") - set ( CMAKE_SHARED_LINKER_FLAGS "") - set ( CMAKE_MODULE_LINKER_FLAGS "") + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc") endif (CMAKE_C_COMPILER MATCHES "icc") endif (CMAKE_SYSTEM_NAME MATCHES Linux) @@ -606,23 +604,21 @@ if (CMAKE_C_COMPILER MATCHES "icc") # Select flags. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") set(CMAKE_CXX_FLAGS_RELEASE "-O2") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") + set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") - if (CMAKE_SYSTEM_NAME MATCHES Linux) - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -Wpointer-arith") - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -Wpointer-arith -fno-exceptions") - endif (CMAKE_SYSTEM_NAME MATCHES Linux) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -no-gcc -Wpointer-arith -fno-common") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -no-gcc -Wpointer-arith -fno-exceptions -fno-common") # visibility support -# check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY) -# if (__KDE_HAVE_GCC_VISIBILITY) +# check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_ICC_VISIBILITY) +# if (__KDE_HAVE_ICC_VISIBILITY) # set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") -# endif (__KDE_HAVE_GCC_VISIBILITY) +# endif (__KDE_HAVE_ICC_VISIBILITY) endif (CMAKE_C_COMPILER MATCHES "icc") |