diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
| commit | 39b7bfe6bdc53c08dd5eab7058dfc3d415dfe58c (patch) | |
| tree | a476f61efd8381903897eb52d7898418d477a6b3 /intern/ghost/CMakeLists.txt | |
| parent | 722376ed7baf73e3ab6727047130f19873113429 (diff) | |
- check IF WIN32 AND NOT UNIX (for cygwin)
- patch from Mike S to enable OpenMP and xcode
Diffstat (limited to 'intern/ghost/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index cd3bbd00b9f..8319772adeb 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -68,16 +68,7 @@ IF(APPLE) IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) -ELSEIF(WIN32) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") - LIST(APPEND INC ${WINTAB_INC}) - LIST(APPEND SRC - ./intern/GHOST_DisplayManagerWin32.cpp - ./intern/GHOST_SystemWin32.cpp - ./intern/GHOST_WindowWin32.cpp - ./intern/GHOST_DropTargetWin32.cpp - ) ELSEIF(UNIX) LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) @@ -89,6 +80,18 @@ ELSEIF(UNIX) ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}") +ELSEIF(WIN32) + IF(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + LIST(APPEND INC ${WINTAB_INC}) + ENDIF(MSVC) + + LIST(APPEND SRC + ./intern/GHOST_DisplayManagerWin32.cpp + ./intern/GHOST_SystemWin32.cpp + ./intern/GHOST_WindowWin32.cpp + ./intern/GHOST_DropTargetWin32.cpp + ) ENDIF(APPLE) BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}") |