diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-27 16:57:09 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-27 16:57:09 -0800 |
| commit | 5c08896e6c4124de69f43f0765468dc4d517920b (patch) | |
| tree | 47ef644eadac0e9271eb26e4e222035461f6bfae /images | |
| parent | bf8677c9a96c3ed7fae48a57759b9f4742cd7593 (diff) | |
| parent | 7d3842dbd01175dc04cbd77e852b30af3ab5ac35 (diff) | |
| download | uhd-5c08896e6c4124de69f43f0765468dc4d517920b.tar.gz uhd-5c08896e6c4124de69f43f0765468dc4d517920b.tar.bz2 uhd-5c08896e6c4124de69f43f0765468dc4d517920b.zip | |
Merge branch 'uhd_master' into uhd_next
Diffstat (limited to 'images')
| -rw-r--r-- | images/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index 75cb4c9d3..ee8146f3a 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -15,14 +15,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(UHD-images NONE) - ######################################################################## -# Config Files (include order is important) +# Setup Project ######################################################################## -INCLUDE(${CMAKE_SOURCE_DIR}/../host/config/Python.cmake) -INCLUDE(${CMAKE_SOURCE_DIR}/../host/config/Version.cmake) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(UHD-images NONE) +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../host/Modules) +INCLUDE(UHDVersion) #sets version variables (used below) ######################################################################## # Setup CPack |