diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2017-03-22 14:08:55 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2017-03-22 14:34:06 +0000 |
| commit | f5df5d036e3031acbd3cdced97d3f0ed46ea9427 (patch) | |
| tree | dcdbb06d74d84753a9faf26c0b29954daa9f459a /thirdparty | |
| parent | 1e579c41545ac4a7ed5b8dd7fd79dd7dad120558 (diff) | |
cmake: Don't check for unusued D3D headers/libraries.
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/directxtex/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | thirdparty/dxerr/CMakeLists.txt | 19 |
2 files changed, 8 insertions, 13 deletions
diff --git a/thirdparty/directxtex/CMakeLists.txt b/thirdparty/directxtex/CMakeLists.txt index afe7f3bc..d67b7eee 100644 --- a/thirdparty/directxtex/CMakeLists.txt +++ b/thirdparty/directxtex/CMakeLists.txt @@ -1,6 +1,6 @@ include (CheckIncludeFileCXX) -if (DirectX_D3D11_INCLUDE_FOUND) +if (DirectX_D3D11_3_INCLUDE_FOUND) include_directories (BEFORE ${DirectX_D3D11_INCLUDE_DIR} diff --git a/thirdparty/dxerr/CMakeLists.txt b/thirdparty/dxerr/CMakeLists.txt index b63b69ca..26802e66 100644 --- a/thirdparty/dxerr/CMakeLists.txt +++ b/thirdparty/dxerr/CMakeLists.txt @@ -1,16 +1,11 @@ -macro (HaveDirectXInclude NAME) - if (DirectX_${NAME}_INCLUDE_FOUND) - include_directories (BEFORE SYSTEM - ${DirectX_${NAME}_INCLUDE_DIR} - ) - add_definitions (-DHAVE_${NAME}) - endif () -endmacro () +add_definitions (-DHAVE_DDRAW) +add_definitions (-DHAVE_D3D9) -havedirectxinclude (DDRAW) -havedirectxinclude (D3D9) -havedirectxinclude (D3D10_1) -havedirectxinclude (D3D11_1) +if (DirectX_D3D11_3_INCLUDE_FOUND) + include_directories (BEFORE SYSTEM DirectX_D3D11_3_INCLUDE_DIR) + add_definitions (-DHAVE_D3D10_1) + add_definitions (-DHAVE_D3D11_1) +endif () add_library (dxerr STATIC dxerr.cpp |