summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2013-03-18 09:45:35 -0700
committerJohnathan Corgan2013-03-18 09:45:35 -0700
commitf9106c614cfc27558561c69ee4c070c1711fe0bd (patch)
tree0090a5b44005d9c3647d671f9327bb667a5cdec2
parent456790ef73c859c10bca0a1d18da7d00aaed47f0 (diff)
parentbc79c5b78793caf198340ef2504ba07d0ddc3960 (diff)
downloadgnuradio-f9106c614cfc27558561c69ee4c070c1711fe0bd.tar.gz
gnuradio-f9106c614cfc27558561c69ee4c070c1711fe0bd.tar.bz2
gnuradio-f9106c614cfc27558561c69ee4c070c1711fe0bd.zip
Merge remote-tracking branch 'ncorgan/volk_msvc_fix' into maint
-rw-r--r--volk/apps/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt
index 03ad92b79..8306f1e46 100644
--- a/volk/apps/CMakeLists.txt
+++ b/volk/apps/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2011-2012 Free Software Foundation, Inc.
+# Copyright 2011-2013 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
if(Boost_FOUND)
if(MSVC)
- include_directories(${CMAKE_SOURCE_DIR}/msvc)
+ include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
endif(MSVC)
include_directories(