diff options
| author | Kent Mein <mein@cs.umn.edu> | 2012-01-12 20:31:27 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2012-01-12 20:31:27 +0400 |
| commit | 9dc992a3fd625cdcf1b9611b39b0cd8fa865ac19 (patch) | |
| tree | 8ee2ab22376e33ed79fc8a4e55632ac4e38bda49 /CMakeLists.txt | |
| parent | 8b59efe129748f6043bc2bb0605d977fea9b7183 (diff) | |
Some small fixes to get things compiling on solaris with cmake.
There are also some changes that need to be done to libmv but I'm
leaving those out so I can get it patched upstream first.
(Only works with gcc/g++ if we want to use sun's compiler we would need
to get rid of all of our annonymous structs which I don't think
we want to do at this point, example:
typedef struct wmNDOFMotionData {
union {
float tvec[3]; // translation
struct { float tx, ty, tz; }; // this would need to be fixed
// something like this or something similar:
struct { float x, y, z; } t;
};
...
)
Kent
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fa6ed26bc7..61a1bd3a080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -620,6 +620,10 @@ if(UNIX AND NOT APPLE) # CLang is the same as GCC for now. elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") + # Solaris CC + elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") + set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__") + # Intel C++ Compiler elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") # think these next two are broken |