diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 18:12:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-18 18:12:54 +0400 |
commit | 968b2a8afbef552988d10df38e358d97d273dc8c (patch) | |
tree | 5ded93eec5c0762cbbd77d09d21ff81b3d6bc524 /source/blender | |
parent | 549c2c58a109974408de29515b48161a756491c9 (diff) |
rename cmake include/libraries to conform with suggested cmake names
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenpluginapi/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/collada/CMakeLists.txt | 20 | ||||
-rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/quicktime/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5078657588d..9c06e325ce2 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -273,12 +273,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 0c25da325ad..c6848346220 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -137,7 +137,7 @@ set(SRC ) if(WITH_BINRELOC) - list(APPEND INC_SYS "${BINRELOC_INC}") + list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}") add_definitions(-DWITH_BINRELOC) endif() diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index c3aad25ccbe..a5af15d7f55 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -50,7 +50,7 @@ set(SRC ) if(WITH_CODEC_QUICKTIME) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index a7e7c973f36..07da532146f 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -44,19 +44,19 @@ set(INC_SYS if(APPLE) list(APPEND INC_SYS - ${OPENCOLLADA_INC}/COLLADAStreamWriter - ${OPENCOLLADA_INC}/COLLADABaseUtils - ${OPENCOLLADA_INC}/COLLADAFramework - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader - ${OPENCOLLADA_INC}/GeneratedSaxParser + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter + ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework + ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader + ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser ) else() list(APPEND INC_SYS - ${OPENCOLLADA_INC}/COLLADAStreamWriter/include - ${OPENCOLLADA_INC}/COLLADABaseUtils/include - ${OPENCOLLADA_INC}/COLLADAFramework/include - ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include - ${OPENCOLLADA_INC}/GeneratedSaxParser/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/include + ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/include ) endif() diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index c3bb6f457a2..0d1de00806b 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -52,7 +52,7 @@ set(SRC if(WITH_CODEC_QUICKTIME) list(APPEND INC ../../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 16bc7854617..812d5c03fdb 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -130,12 +130,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4e4ff396e71..ed5a1566cdc 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -177,7 +177,7 @@ if(WITH_CODEC_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index 3b70cf19a7f..0ed773ddd93 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -43,7 +43,7 @@ set(INC ) set(INC_SYS - ${QUICKTIME_INC} + ${QUICKTIME_INCLUDE_DIRS} ) if(USE_QTKIT) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index aea377a35bb..7521d6b9ce5 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -124,7 +124,7 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 0cf59a9b598..f9c1d800c02 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -90,12 +90,12 @@ endif() if(WITH_CODEC_QUICKTIME) list(APPEND INC ../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INC}) + list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) add_definitions(-DWITH_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS}) add_definitions(-DWITH_FFMPEG) endif() |