summaryrefslogtreecommitdiff
path: root/compiler/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/cmake')
-rw-r--r--compiler/cmake/ServerApp.cmake1
-rw-r--r--compiler/cmake/sample_d3d11.cmake7
-rw-r--r--compiler/cmake/sample_opengl.cmake1
-rw-r--r--compiler/cmake/test_d3d11.cmake7
4 files changed, 6 insertions, 10 deletions
diff --git a/compiler/cmake/ServerApp.cmake b/compiler/cmake/ServerApp.cmake
index 175593a..866fd0d 100644
--- a/compiler/cmake/ServerApp.cmake
+++ b/compiler/cmake/ServerApp.cmake
@@ -2,7 +2,6 @@
# Build serverapp
#
-SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
SET(TEST_SOURCE_DIR ${PROJECT_SOURCE_DIR}/test/serverapp)
SET(LIB_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
diff --git a/compiler/cmake/sample_d3d11.cmake b/compiler/cmake/sample_d3d11.cmake
index 96ab6a4..9a0e219 100644
--- a/compiler/cmake/sample_d3d11.cmake
+++ b/compiler/cmake/sample_d3d11.cmake
@@ -2,11 +2,10 @@
# Build sample_d3d11
#
-SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
-FIND_PACKAGE(DXUT REQUIRED)
-FIND_PACKAGE(FX11 REQUIRED)
-FIND_PACKAGE(DirectXTK REQUIRED)
+FIND_PACKAGE(DXUT 1.0 REQUIRED)
+FIND_PACKAGE(FX11 1.0 REQUIRED)
+FIND_PACKAGE(DirectXTK 1.0 REQUIRED)
FIND_PACKAGE(FXC REQUIRED)
SET(SAMP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/sample/d3d11)
diff --git a/compiler/cmake/sample_opengl.cmake b/compiler/cmake/sample_opengl.cmake
index ce71e04..6518c90 100644
--- a/compiler/cmake/sample_opengl.cmake
+++ b/compiler/cmake/sample_opengl.cmake
@@ -2,7 +2,6 @@
# Build sample_opengl
#
-SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
FIND_PACKAGE(AntTweakBar REQUIRED)
diff --git a/compiler/cmake/test_d3d11.cmake b/compiler/cmake/test_d3d11.cmake
index a51a126..155845d 100644
--- a/compiler/cmake/test_d3d11.cmake
+++ b/compiler/cmake/test_d3d11.cmake
@@ -2,11 +2,10 @@
# Build test_d3d11
#
-SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
-FIND_PACKAGE(DXUT REQUIRED)
-FIND_PACKAGE(FX11 REQUIRED)
-FIND_PACKAGE(DirectXTK REQUIRED)
+FIND_PACKAGE(DXUT 1.0 REQUIRED)
+FIND_PACKAGE(FX11 1.0 REQUIRED)
+FIND_PACKAGE(DirectXTK 1.0 REQUIRED)
FIND_PACKAGE(FXC REQUIRED)
MESSAGE("FX11 ${FX11_SDK_PATH}")