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 /intern/ghost/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 'intern/ghost/CMakeLists.txt')
-rw-r--r-- | intern/ghost/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index c6ffd4b1913..ec81ddf8ef2 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -52,13 +52,13 @@ SET(SRC IF(APPLE) IF(WITH_COCOA) - SET(SRC ${SRC} + LIST(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm ) ELSE(WITH_COCOA) - SET(SRC ${SRC} + LIST(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp @@ -69,18 +69,18 @@ IF(APPLE) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) ELSEIF(WIN32) - SET(INC ${INC} ${WINTAB_INC}) + LIST(APPEND INC ${WINTAB_INC}) - SET(SRC ${SRC} + LIST(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp ) ELSEIF(UNIX) - SET(INC ${INC} ${X11_X11_INCLUDE_PATH}) + LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) - SET(SRC ${SRC} + LIST(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp |