Commit 92b2ec43 authored by Jussi Lindgren's avatar Jussi Lindgren

build:

 * Fixed glitches in the build

git-svn-id: svn://scm.gforge.inria.fr/svn/openvibe@3704 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f
parent 09b11b0b
......@@ -15,30 +15,27 @@ FUNCTION(OV_ADD_PROJECTS CURRENT_FOLDER_PREFIX)
IF(IS_DIRECTORY ${FULLPATH} AND NOT ${FULLPATH} MATCHES ".*\\.svn")
GET_FILENAME_COMPONENT(DIRNAME ${FULLPATH} NAME)
SET(OV_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${DIRNAME}")
STRING(TOUPPER ${DIRNAME} DIRNAMEUPPER)
SET(SKIP_THIS_FOLDER "SKIP_${CURRENT_FOLDER_PREFIX}_${DIRNAMEUPPER}")
SET(SUBDIR "SUBDIR-NOTFOUND")
SET(SKIP_THIS_FOLDER "SKIP_${CURRENT_FOLDER_PREFIX}_${DIRNAMEUPPER}")
# MESSAGE(STATUS "Checking ${CURRENT_BRANCH_PREFIX}_${DIRNAMEUPPER} as branch var ${BRANCH_VARIABLE_NAME}")
#MESSAGE(STATUS "Checking SKIP_${CURRENT_FOLDER_PREFIX}_${DIRNAMEUPPER} as branch var ${SKIP_THIS_FOLDER}")
IF(${SKIP_THIS_FOLDER})
MESSAGE(STATUS "Note: ${CURRENT_FOLDER_PREFIX}/${DIRNAME} has been disabled by setting SKIP_${CURRENT_FOLDER_PREFIX}_${DIRNAMEUPPER}")
MESSAGE(STATUS "Note: ${FULLPATH} has been skipped by setting SKIP_${CURRENT_FOLDER_PREFIX}_${DIRNAMEUPPER}")
ELSE(${SKIP_THIS_FOLDER})
#MESSAGE(STATUS "Inserting folder ${SUBDIR}")
# MESSAGE(STATUS "Inserting folder ${FULLPATH}")
# Add the dir to be parsed for documentation later. We need to do this before adding subdir, in case the subdir is the actual docs dir
GET_PROPERTY(OV_TMP GLOBAL PROPERTY OV_PROP_CURRENT_PROJECTS)
SET(OV_TMP "${OV_TMP};${FULLPATH}")
SET_PROPERTY(GLOBAL PROPERTY OV_PROP_CURRENT_PROJECTS ${OV_TMP})
# MESSAGE(STATUS "BDIR ${OV_CURRENT_BINARY_DIR}/${SUBDIR}")
SET(OV_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${DIRNAME}")
# MESSAGE(STATUS "BDIR ${OV_CURRENT_BINARY_DIR}")
GET_PROPERTY(OV_TMP GLOBAL PROPERTY OV_PROP_CURRENT_PROJECTS_BUILD_DIR)
SET(OV_TMP "${OV_TMP};${OV_CURRENT_BINARY_DIR}")
SET_PROPERTY(GLOBAL PROPERTY OV_PROP_CURRENT_PROJECTS_BUILD_DIR ${OV_TMP})
add_subdirectory(${FULLPATH})
ENDIF(${SKIP_THIS_FOLDER})
......
......@@ -19,8 +19,8 @@ echo "__________________________________________________________________________
echo ""
ov_script_dir="${PWD}"
ov_build_dir="${ov_script_dir}/../../local-tmp/linux-${ov_build_type}"
ov_install_dir="${ov_script_dir}/../../dist"
ov_build_dir="${ov_script_dir}/../local-tmp/linux-${ov_build_type}"
ov_install_dir="${ov_script_dir}/../dist"
mkdir -p "${ov_build_dir}" 2> /dev/null
pushd "${ov_build_dir}" 2> /dev/null
......
......@@ -12,8 +12,8 @@ call "!InitEnvScript!"
REM #######################################################################################
set ov_script_dir=%CD%
set ov_build_dir=%ov_script_dir%\..\..\local-tmp\visual
set ov_install_dir=%ov_script_dir%\..\..\dist
set ov_build_dir=%ov_script_dir%\..\local-tmp\visual
set ov_install_dir=%ov_script_dir%\..\dist
mkdir %ov_build_dir% 2>NUL
cd /D %ov_build_dir%
......
......@@ -7,7 +7,7 @@ SET InitEnvScript="win32-init_env_command.cmd"
call "!InitEnvScript!"
REM needed for debugging in VS ...
SET "OV_PATH_ROOT=%CD%\..\..\dist"
SET "OV_PATH_ROOT=%CD%\..\dist"
SET "OV_PATH_BIN=%OV_PATH_ROOT%\bin"
SET "OV_PATH_DATA=%OV_PATH_ROOT%\share\openvibe"
SET "OV_PATH_LIB=%OV_PATH_ROOT%\bin"
......@@ -15,4 +15,4 @@ SET "PATH=%OV_PATH_ROOT%\bin;%PATH%"
REM for visual studio express...
"%VSINSTALLDIR%Common7\IDE\VCExpress.exe" ..\..\local-tmp\visual\OpenViBE.sln
"%VSINSTALLDIR%Common7\IDE\VCExpress.exe" ..\local-tmp\visual\OpenViBE.sln
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment