solve root and build directories

Former-commit-id: 0f86f2fff1
pull/1161/head
edgarriba 2015-11-16 11:41:44 +00:00
rodzic a31f394ce2
commit 6b65958a8d
7 zmienionych plików z 21 dodań i 13 usunięć

Wyświetl plik

@ -2,8 +2,11 @@ cmake_minimum_required(VERSION 2.8)
project(ODM-SuperBuild)
# Setup SuperBuild root location
set(SB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
# Path to additional CMake modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
set(CMAKE_MODULE_PATH ${SB_ROOT_DIR}/cmake)
include(ExternalProject)
include(ExternalProject-Setup)
@ -13,11 +16,8 @@ include(ExternalProject-Setup)
# Setup SuperBuild directories #
################################
# Setup SuperBuild root location
set(SB_ROOT_DIR ${CMAKE_SOURCE_DIR})
# Setup location where source tar-balls are downloaded
set(SB_DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/download"
set(SB_DOWNLOAD_DIR "${SB_ROOT_DIR}/download"
CACHE PATH "Location where source tar-balls are (to be) downloaded.")
mark_as_advanced(SB_DOWNLOAD_DIR)
@ -25,7 +25,7 @@ message(STATUS "SuperBuild files will be downloaded to: ${SB_DOWNLOAD_DIR}")
# Setup location where source tar-balls are located
set(SB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src"
set(SB_SOURCE_DIR "${SB_ROOT_DIR}/src"
CACHE PATH "Location where source tar-balls are (will be).")
mark_as_advanced(SB_SOURCE_DIR)
@ -33,13 +33,21 @@ message(STATUS "SuperBuild source files will be extracted to: ${SB_SOURCE_DIR}")
# Setup location where source tar-balls are located
set(SB_INSTALL_DIR "${CMAKE_SOURCE_DIR}/install"
set(SB_INSTALL_DIR "${SB_ROOT_DIR}/install"
CACHE PATH "Location where source tar-balls are (will be) installed.")
mark_as_advanced(SB_SOURCE_DIR)
message(STATUS "SuperBuild source files will be installed to: ${SB_INSTALL_DIR}")
# Setup location where binary files are located
set(SB_BINARY_DIR "${SB_ROOT_DIR}/build"
CACHE PATH "Location where files are (will be) located.")
mark_as_advanced(SB_BINARY_DIR)
message(STATUS "SuperBuild binary files will be located to: ${SB_BINARY_DIR}")
#########################################
# Download and install third party libs #
#########################################

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name cmvs)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
PREFIX ${_SB_BINARY_DIR}

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name ceres)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
PREFIX ${_SB_BINARY_DIR}

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name opencv)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
PREFIX ${_SB_BINARY_DIR}

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name opensfm)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
DEPENDS ceres opencv openvg

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name openvg)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
PREFIX ${_SB_BINARY_DIR}

Wyświetl plik

@ -1,5 +1,5 @@
set(_proj_name pcl)
set(_SB_BINARY_DIR "${CMAKE_BINARY_DIR}/${_proj_name}")
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
ExternalProject_Add(${_proj_name}
PREFIX ${_SB_BINARY_DIR}