aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-07-08 12:22:14 -0700
committerJosh Blum <josh@joshknows.com>2011-07-08 12:22:14 -0700
commit41e9ededc9ca0d33c67dd7f2051278d375386930 (patch)
treeae0e280c045bc0d848e355fd58f55ec01858dfbd /host
parent17fabccfe4be79f3a5a0a3d7ab14ea72a791ecd9 (diff)
downloaduhd-41e9ededc9ca0d33c67dd7f2051278d375386930.tar.gz
uhd-41e9ededc9ca0d33c67dd7f2051278d375386930.tar.bz2
uhd-41e9ededc9ca0d33c67dd7f2051278d375386930.zip
uhd: moved modules and some other files into cmake subdir
Diffstat (limited to 'host')
-rw-r--r--host/CMakeLists.txt6
-rw-r--r--host/cmake/Modules/FindDocutils.cmake (renamed from host/Modules/FindDocutils.cmake)0
-rw-r--r--host/cmake/Modules/FindGit.cmake (renamed from host/Modules/FindGit.cmake)0
-rw-r--r--host/cmake/Modules/FindUSB1.cmake (renamed from host/Modules/FindUSB1.cmake)0
-rw-r--r--host/cmake/Modules/UHDComponent.cmake (renamed from host/Modules/UHDComponent.cmake)0
-rw-r--r--host/cmake/Modules/UHDPackage.cmake (renamed from host/Modules/UHDPackage.cmake)0
-rw-r--r--host/cmake/Modules/UHDPython.cmake (renamed from host/Modules/UHDPython.cmake)0
-rw-r--r--host/cmake/Modules/UHDVersion.cmake (renamed from host/Modules/UHDVersion.cmake)0
-rw-r--r--host/cmake/cmake_uninstall.cmake.in (renamed from host/cmake_uninstall.cmake.in)0
-rw-r--r--host/cmake/msvc/inttypes.h (renamed from host/msvc/inttypes.h)0
-rw-r--r--host/cmake/msvc/stdint.h (renamed from host/msvc/stdint.h)0
11 files changed, 3 insertions, 3 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 034257551..7fa6dd36b 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -26,7 +26,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(UHD CXX)
ENABLE_TESTING()
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/Modules)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
INCLUDE(UHDComponent) #enable components
INCLUDE(UHDPackage) #setup cpack
@@ -81,7 +81,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
IF(MSVC)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc)
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/cmake/msvc)
ADD_DEFINITIONS( #stop all kinds of compatibility warnings
-D_SCL_SECURE_NO_WARNINGS
-D_SCL_SECURE_NO_DEPRECATE
@@ -160,7 +160,7 @@ PYTHON_CHECK_MODULE(
# Create Uninstall Target
########################################################################
CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in
+ ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
@ONLY)
diff --git a/host/Modules/FindDocutils.cmake b/host/cmake/Modules/FindDocutils.cmake
index 3a97d8643..3a97d8643 100644
--- a/host/Modules/FindDocutils.cmake
+++ b/host/cmake/Modules/FindDocutils.cmake
diff --git a/host/Modules/FindGit.cmake b/host/cmake/Modules/FindGit.cmake
index 2d8214287..2d8214287 100644
--- a/host/Modules/FindGit.cmake
+++ b/host/cmake/Modules/FindGit.cmake
diff --git a/host/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake
index efb2e288b..efb2e288b 100644
--- a/host/Modules/FindUSB1.cmake
+++ b/host/cmake/Modules/FindUSB1.cmake
diff --git a/host/Modules/UHDComponent.cmake b/host/cmake/Modules/UHDComponent.cmake
index 52b7450d5..52b7450d5 100644
--- a/host/Modules/UHDComponent.cmake
+++ b/host/cmake/Modules/UHDComponent.cmake
diff --git a/host/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index e36793d73..e36793d73 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
diff --git a/host/Modules/UHDPython.cmake b/host/cmake/Modules/UHDPython.cmake
index fdcdccb4b..fdcdccb4b 100644
--- a/host/Modules/UHDPython.cmake
+++ b/host/cmake/Modules/UHDPython.cmake
diff --git a/host/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index f5364941c..f5364941c 100644
--- a/host/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
diff --git a/host/cmake_uninstall.cmake.in b/host/cmake/cmake_uninstall.cmake.in
index 6031a6ca9..6031a6ca9 100644
--- a/host/cmake_uninstall.cmake.in
+++ b/host/cmake/cmake_uninstall.cmake.in
diff --git a/host/msvc/inttypes.h b/host/cmake/msvc/inttypes.h
index 1c2baa82e..1c2baa82e 100644
--- a/host/msvc/inttypes.h
+++ b/host/cmake/msvc/inttypes.h
diff --git a/host/msvc/stdint.h b/host/cmake/msvc/stdint.h
index 15333b467..15333b467 100644
--- a/host/msvc/stdint.h
+++ b/host/cmake/msvc/stdint.h