diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 05:13:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-07 05:13:10 +0400 |
| commit | 2406ebe1a47c388df8b1ea003d7f768df947460f (patch) | |
| tree | a1bdf0b221d4861e53aaf3e70578d1fd738f9bda /CMakeLists.txt | |
| parent | e0aca888deeeeeba86959ed974619140667db1fb (diff) | |
- added back zlib include (needed for win32).
- use list append in more places.
- remove non existing include dir.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ca96fc8dc8..4fdc6b9ebf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,8 +309,8 @@ IF(UNIX AND NOT APPLE) IF(WITH_OPENMP) LIST(APPEND LLIBS -lgomp) - LIST(APPEND CMAKE_C_FLAGS -fopenmp) - LIST(APPEND CMAKE_CXX_FLAGS -fopenmp) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp") ENDIF(WITH_OPENMP) @@ -401,8 +401,7 @@ IF(WIN32) ENDIF(WITH_QUICKTIME) IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) + ADD_DEFINITIONS(-D__SSE__ -D__MMX__) ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) IF(MSVC) @@ -865,8 +864,7 @@ IF(WITH_RAYOPTIMIZATION) IF(CMAKE_COMPILER_IS_GNUCC) IF(SUPPORT_SSE_BUILD) SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) + ADD_DEFINITIONS(-D__SSE__ -D__MMX__) ENDIF(SUPPORT_SSE_BUILD) IF(SUPPORT_SSE2_BUILD) SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}") |