Skip to content
Snippets Groups Projects
Commit f60dc350 authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Introduce WITH_PYTHON3 cmake variable globally. 

Controls whether the build is against Python2 or Python3.
CMake checks have been introduced to flush out old variables
if a previous build was against a different python major.minor
version.
parent b0e4e9f9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
buildconfig/CMake/Bootstrap.cmake
+ 151
− 67
View file @ f60dc350
################################################################################ # ##############################################################################
# Configure required dependencies if necessary # Configure required dependencies if necessary
################################################################################ # ##############################################################################
if( MSVC ) option(WITH_PYTHON3 "If true build against Python 3, else use Python 2" OFF)
if(MSVC)
# Git LFS does not work properly with <= 1.9 # Git LFS does not work properly with <= 1.9
find_package ( Git 1.9.5 REQUIRED ) find_package(Git 1.9.5 REQUIRED)
find_package ( GitLFS REQUIRED) find_package(GitLFS REQUIRED)
# Use ExternalProject functionality as it already knows how to do clone/update # Use ExternalProject functionality as it already knows how to do clone/update
include ( ExternalProject ) include(ExternalProject)
set( EXTERNAL_ROOT ${PROJECT_SOURCE_DIR}/external CACHE PATH "Location to clone third party dependencies to" ) set(EXTERNAL_ROOT
set( THIRD_PARTY_GIT_URL "https://github.com/mantidproject/thirdparty-msvc2015.git" ) ${PROJECT_SOURCE_DIR}/external
set ( THIRD_PARTY_GIT_SHA1 a7bd18f35c8d67e68c3a965a07057efa266fc7d7 ) CACHE PATH "Location to clone third party dependencies to"
set ( THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty ) )
set(THIRD_PARTY_GIT_URL
"https://github.com/mantidproject/thirdparty-msvc2015.git"
)
set(THIRD_PARTY_GIT_SHA1 a7bd18f35c8d67e68c3a965a07057efa266fc7d7)
set(THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty)
# Generates a script to do the clone/update in tmp # Generates a script to do the clone/update in tmp
set ( _project_name ThirdParty ) set(_project_name ThirdParty)
ExternalProject_Add( ${_project_name} externalproject_add(
${_project_name}
PREFIX ${EXTERNAL_ROOT} PREFIX ${EXTERNAL_ROOT}
GIT_REPOSITORY ${THIRD_PARTY_GIT_URL} GIT_REPOSITORY ${THIRD_PARTY_GIT_URL}
GIT_TAG ${THIRD_PARTY_GIT_SHA1} GIT_TAG ${THIRD_PARTY_GIT_SHA1}
...@@ -23,74 +31,150 @@ if( MSVC ) ...@@ -23,74 +31,150 @@ if( MSVC )
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
) )
set_target_properties ( ${_project_name} PROPERTIES set_target_properties(
EXCLUDE_FROM_DEFAULT_BUILD 1 ${_project_name} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1 EXCLUDE_FROM_ALL 1
EXCLUDE_FROM_ALL 1) )
# Do fetch/update now as we need the dependencies to configure # Do fetch/update now as we need the dependencies to configure
set ( _tmp_dir ${EXTERNAL_ROOT}/tmp ) set(_tmp_dir ${EXTERNAL_ROOT}/tmp)
if ( NOT EXISTS ${THIRD_PARTY_DIR}/.git ) if(NOT EXISTS ${THIRD_PARTY_DIR}/.git)
message ( STATUS "Fetching third party dependencies" ) message(STATUS "Fetching third party dependencies")
# As of git lfs 1.02 the default 'git checkout' behaviour is very slow for a large amount of data. Running the # As of git lfs 1.02 the default 'git checkout' behaviour is very slow for a
# 'git lfs fetch' command however produces better suitable performance as it downloads everything in parallel. # large amount of data. Running the 'git lfs fetch' command however produces
# We there for first clone the bare repository containing the data pointers and update them manually # better suitable performance as it downloads everything in parallel. We
# see https://github.com/github/git-lfs/issues/376 for more information # there for first clone the bare repository containing the data pointers and
set ( ENV{GIT_LFS_SKIP_SMUDGE} 1 ) # update them manually see https://github.com/github/git-lfs/issues/376 for
execute_process ( COMMAND ${CMAKE_COMMAND} ARGS -P ${_tmp_dir}/${_project_name}-gitclone.cmake # more information
RESULT_VARIABLE error_code ) set(ENV{GIT_LFS_SKIP_SMUDGE} 1)
if ( error_code ) execute_process(
message(FATAL_ERROR "Failed to clone repository: '${THIRD_PARTY_GIT_URL}'") COMMAND ${CMAKE_COMMAND} ARGS -P
endif () ${_tmp_dir}/${_project_name}-gitclone.cmake
unset ( ENV{GIT_LFS_SKIP_SMUDGE} ) RESULT_VARIABLE error_code
)
if(error_code)
message(
FATAL_ERROR "Failed to clone repository: '${THIRD_PARTY_GIT_URL}'"
)
endif()
unset(ENV{GIT_LFS_SKIP_SMUDGE})
# Fetch the binary data # Fetch the binary data
execute_process ( COMMAND ${GIT_EXECUTABLE} lfs fetch execute_process(
WORKING_DIRECTORY ${THIRD_PARTY_DIR} COMMAND ${GIT_EXECUTABLE} lfs fetch
RESULT_VARIABLE error_code ) WORKING_DIRECTORY ${THIRD_PARTY_DIR}
if ( error_code ) RESULT_VARIABLE error_code
message(FATAL_ERROR "Failed to download third party binary data. Check your network connection") )
endif () if(error_code)
message(
FATAL_ERROR
"Failed to download third party binary data. Check your network connection"
)
endif()
# Checkout the data from the index to the working directory # Checkout the data from the index to the working directory
execute_process ( COMMAND ${GIT_EXECUTABLE} lfs checkout execute_process(
WORKING_DIRECTORY ${THIRD_PARTY_DIR} COMMAND ${GIT_EXECUTABLE} lfs checkout
RESULT_VARIABLE error_code ) WORKING_DIRECTORY ${THIRD_PARTY_DIR}
else () RESULT_VARIABLE error_code
message ( STATUS "Updating third party dependencies" ) )
else()
message(STATUS "Updating third party dependencies")
# Assume the updates are small & don't run git lfs fetch # Assume the updates are small & don't run git lfs fetch
execute_process ( COMMAND ${CMAKE_COMMAND} ARGS -P ${_tmp_dir}/${_project_name}-gitupdate.cmake execute_process(
RESULT_VARIABLE error_code ) COMMAND ${CMAKE_COMMAND} ARGS -P
if ( error_code ) ${_tmp_dir}/${_project_name}-gitupdate.cmake
message(FATAL_ERROR "Failed to update repository: '${THIRD_PARTY_GIT_URL}'") RESULT_VARIABLE error_code
endif () )
endif () if(error_code)
unset ( _tmp_dir ) message(
FATAL_ERROR "Failed to update repository: '${THIRD_PARTY_GIT_URL}'"
)
endif()
endif()
unset(_tmp_dir)
# Print out where we are looking for 3rd party stuff # Print out where we are looking for 3rd party stuff
option ( WITH_PYTHON3 "If true then build against Python 3.8" OFF ) if(WITH_PYTHON3)
if ( WITH_PYTHON3 ) set(PYTHON_VERSION_MAJOR 3)
set ( PYTHON_VERSION_MAJOR 3 ) set(PYTHON_VERSION_MINOR 8)
set ( PYTHON_VERSION_MINOR 8 )
else() else()
set ( PYTHON_VERSION_MAJOR 2 ) set(PYTHON_VERSION_MAJOR 2)
set ( PYTHON_VERSION_MINOR 7 ) set(PYTHON_VERSION_MINOR 7)
endif() endif()
set ( THIRD_PARTY_BIN "${THIRD_PARTY_DIR}/bin;${THIRD_PARTY_DIR}/lib/qt4/bin;${THIRD_PARTY_DIR}/lib/qt5/bin;${THIRD_PARTY_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" ) set(PYTHON_EXECUTABLE
message ( STATUS "Third party dependencies are in ${THIRD_PARTY_DIR}" ) ${THIRD_PARTY_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/python.exe
# Add to the path so that cmake can configure correctly without the user having to do it )
set ( ENV{PATH} "${THIRD_PARTY_BIN};$ENV{PATH}" ) set(THIRD_PARTY_BIN
"${THIRD_PARTY_DIR}/bin;${THIRD_PARTY_DIR}/lib/qt4/bin;${THIRD_PARTY_DIR}/lib/qt5/bin;${THIRD_PARTY_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
)
message(STATUS "Third party dependencies are in ${THIRD_PARTY_DIR}")
# Add to the path so that cmake can configure correctly without the user
# having to do it
set(ENV{PATH} "${THIRD_PARTY_BIN};$ENV{PATH}")
# Set variables to help CMake find components # Set variables to help CMake find components
set ( CMAKE_INCLUDE_PATH "${THIRD_PARTY_DIR}/include" ) set(CMAKE_INCLUDE_PATH "${THIRD_PARTY_DIR}/include")
include_directories ( ${THIRD_PARTY_DIR}/include ) include_directories(${THIRD_PARTY_DIR}/include)
set ( CMAKE_LIBRARY_PATH "${THIRD_PARTY_DIR}/lib" ) set(CMAKE_LIBRARY_PATH "${THIRD_PARTY_DIR}/lib")
set ( CMAKE_PREFIX_PATH "${THIRD_PARTY_DIR};${THIRD_PARTY_DIR}/lib/qt4" ) set(CMAKE_PREFIX_PATH "${THIRD_PARTY_DIR};${THIRD_PARTY_DIR}/lib/qt4")
set ( BOOST_INCLUDEDIR "${CMAKE_INCLUDE_PATH}" ) set(BOOST_INCLUDEDIR "${CMAKE_INCLUDE_PATH}")
set ( BOOST_LIBRARYDIR "${CMAKE_LIBRARY_PATH}" ) set(BOOST_LIBRARYDIR "${CMAKE_LIBRARY_PATH}")
set ( Boost_NO_SYSTEM_PATHS TRUE ) set(Boost_NO_SYSTEM_PATHS TRUE)
else() else()
unset(PYTHON_EXECUTABLE CACHE)
if(WITH_PYTHON3)
find_program(PYTHON_EXECUTABLE python3)
if(NOT PYTHON_EXECUTABLE)
message(FATAL_ERROR "Unable to find python3 executable")
endif()
else()
find_program(PYTHON_EXECUTABLE python)
if(NOT PYTHON_EXECUTABLE)
message(FATAL_ERROR "Unable to find python executable")
endif()
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Homebrew adds qt4 here and we require it to be unlinked # Homebrew adds qt4 here and we require it to be unlinked from /usr/local to
# from /usr/local to avoid qt4/qt5 cross talk # avoid qt4/qt5 cross talk
list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/qt@4) list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/qt@4)
endif() endif()
find_package ( Git ) find_package(Git)
endif()
# Clean out python variables set from a previous build so they can be
# rediscovered again
function(unset_cached_python_variables)
foreach(
_var
PYTHON_INCLUDE_DIR
PYTHON_LIBRARY
PYTHON_NUMPY_INCLUDE_DIR
SIP_INCLUDE_DIR
PYQT4_PYUIC
PYQT4_SIP_DIR
PYQT4_SIP_FLAGS
PYQT4_VERSION
PYQT4_VERSION_STR
PYQT4_VERSION_TAG
PYQT5_PYUIC
PYQT5_SIP_DIR
PYQT5_SIP_FLAGS
PYQT5_VERSION
PYQT5_VERSION_STR
PYQT5_VERSION_TAG
PYRCC5_CMD
)
unset(${_var} CACHE)
endforeach()
endfunction()
# Find python interpreter
find_package(PythonInterp REQUIRED)
message(STATUS "Python version is " ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
# Ensure FindPythonLibs finds the correct libraries
set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
# Handle switching between previously configured Python 2 & Python 3 builds
if(PYTHON_INCLUDE_DIR AND NOT PYTHON_INCLUDE_DIR MATCHES ".*${PYTHON_VERSION_MAJOR}\.${PYTHON_VERSION_MINOR}.*" )
message(STATUS "Python version has changed. Clearing previous Python configuration." )
unset_cached_python_variables()
endif() endif()
buildconfig/CMake/CommonSetup.cmake
+ 0
− 3
View file @ f60dc350
...@@ -105,9 +105,6 @@ else() ...@@ -105,9 +105,6 @@ else()
) )
endif() endif()
find_package(PythonInterp)
set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
# ############################################################################## # ##############################################################################
......
buildconfig/CMake/DarwinSetup.cmake
+ 2
− 20
View file @ f60dc350
...@@ -59,26 +59,8 @@ set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") ...@@ -59,26 +59,8 @@ set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
# Set Qt5 dir according to homebrew location # Set Qt5 dir according to homebrew location
set(Qt5_DIR /usr/local/opt/qt/lib/cmake/Qt5) set(Qt5_DIR /usr/local/opt/qt/lib/cmake/Qt5)
# ############################################################################## # Python flags
# Use python libraries associated with PYTHON_EXECUTABLE If unspecified, use set(PY_VER "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
# first python executable in the PATH.
# ##############################################################################
# Find the python interpreter to get the version we're using (needed for install
# commands below)
find_package(PythonInterp)
if(PYTHON_VERSION_MAJOR)
set(PY_VER "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
message(
STATUS
"Python version is "
${PY_VER}
)
else()
# Older versions of CMake don't set these variables so just assume 2.7
set(PY_VER 2.7)
endif()
execute_process( execute_process(
COMMAND COMMAND
python${PY_VER}-config python${PY_VER}-config
......
buildconfig/Jenkins/buildscript
+ 9
− 9
View file @ f60dc350
...@@ -40,10 +40,10 @@ function run_with_xvfb { ...@@ -40,10 +40,10 @@ function run_with_xvfb {
############################################################################### ###############################################################################
if [ $(command -v xvfb-run) ]; then if [ $(command -v xvfb-run) ]; then
echo "Terminating existing Xvfb sessions" echo "Terminating existing Xvfb sessions"
# Kill Xvfb processes # Kill Xvfb processes
killall Xvfb || true killall Xvfb || true
# Remove Xvfb X server lock files # Remove Xvfb X server lock files
rm -f /tmp/.X${XVFB_SERVER_NUM}-lock rm -f /tmp/.X${XVFB_SERVER_NUM}-lock
fi fi
...@@ -143,7 +143,7 @@ if [[ ${PRBUILD} == true ]]; then ...@@ -143,7 +143,7 @@ if [[ ${PRBUILD} == true ]]; then
DO_BUILD_DEVDOCS=false DO_BUILD_DEVDOCS=false
DO_BUILD_PKG=${BUILD_PACKAGE:-false} DO_BUILD_PKG=${BUILD_PACKAGE:-false}
DO_SYSTEMTESTS=false DO_SYSTEMTESTS=false
if [[ ${ON_RHEL7} == true ]]; then if [[ ${ON_RHEL7} == true ]]; then
# rhel does system testing # rhel does system testing
if ! ${SCRIPT_DIR}/check_for_changes docs-gui-only; then if ! ${SCRIPT_DIR}/check_for_changes docs-gui-only; then
...@@ -252,11 +252,11 @@ PY2_BUILD=false ...@@ -252,11 +252,11 @@ PY2_BUILD=false
PY3_BUILD=false PY3_BUILD=false
if [[ ${JOB_NAME} == *python3* ]]; then if [[ ${JOB_NAME} == *python3* ]]; then
PY3_BUILD=true PY3_BUILD=true
PYTHON3_EXECUTABLE=$(which python3) DIST_FLAGS="${DIST_FLAGS} -DWITH_PYTHON3=ON"
DIST_FLAGS="${DIST_FLAGS} -DPYTHON_EXECUTABLE=$PYTHON3_EXECUTABLE"
PARAVIEW_DIR="${PARAVIEW_DIR}-python3" PARAVIEW_DIR="${PARAVIEW_DIR}-python3"
else else
PY2_BUILD=true PY2_BUILD=true
DIST_FLAGS="${DIST_FLAGS} -DWITH_PYTHON3=OFF"
fi fi
############################################################################### ###############################################################################
...@@ -280,12 +280,12 @@ if [[ ${DO_BUILD_PKG} == true ]]; then ...@@ -280,12 +280,12 @@ if [[ ${DO_BUILD_PKG} == true ]]; then
else else
PACKAGE_SUFFIX="unstable" PACKAGE_SUFFIX="unstable"
fi fi
if [[ ${PY3_BUILD} == true ]]; then if [[ ${PY3_BUILD} == true ]]; then
# Add '-python3' to package name and install path # Add '-python3' to package name and install path
PACKAGE_SUFFIX=${PACKAGE_SUFFIX}-python3 PACKAGE_SUFFIX=${PACKAGE_SUFFIX}-python3
fi fi
if [[ ${JOB_NAME} == *release* ]] && [[ ${PY2_BUILD} == true ]] && [[ -z "${PACKAGE_SUFFIX}" ]]; then if [[ ${JOB_NAME} == *release* ]] && [[ ${PY2_BUILD} == true ]] && [[ -z "${PACKAGE_SUFFIX}" ]]; then
# Traditional install path for python 2 release build # Traditional install path for python 2 release build
PACKAGINGVARS="${PACKAGINGVARS} -DCMAKE_INSTALL_PREFIX=/opt/Mantid -DCPACK_PACKAGE_SUFFIX=" PACKAGINGVARS="${PACKAGINGVARS} -DCMAKE_INSTALL_PREFIX=/opt/Mantid -DCPACK_PACKAGE_SUFFIX="
...@@ -293,7 +293,7 @@ if [[ ${DO_BUILD_PKG} == true ]]; then ...@@ -293,7 +293,7 @@ if [[ ${DO_BUILD_PKG} == true ]]; then
# everything else uses lower-case values # everything else uses lower-case values
PACKAGINGVARS="${PACKAGINGVARS} -DCMAKE_INSTALL_PREFIX=/opt/mantid${PACKAGE_SUFFIX} -DCPACK_PACKAGE_SUFFIX=${PACKAGE_SUFFIX}" PACKAGINGVARS="${PACKAGINGVARS} -DCMAKE_INSTALL_PREFIX=/opt/mantid${PACKAGE_SUFFIX} -DCPACK_PACKAGE_SUFFIX=${PACKAGE_SUFFIX}"
fi fi
if [[ ${ON_RHEL7} == true ]]; then if [[ ${ON_RHEL7} == true ]]; then
if [[ -n "${RELEASE_NUMBER}" ]]; then if [[ -n "${RELEASE_NUMBER}" ]]; then
RELEASE_NUMBER="1" RELEASE_NUMBER="1"
...@@ -430,7 +430,7 @@ fi ...@@ -430,7 +430,7 @@ fi
if [[ ${DO_BUILD_PKG} == true ]]; then if [[ ${DO_BUILD_PKG} == true ]]; then
run_with_xvfb ${CMAKE_EXE} --build . --target docs-qthelp run_with_xvfb ${CMAKE_EXE} --build . --target docs-qthelp
${CPACK_EXE} ${CPACK_EXE}
# Source tarball on clean build (arbitrarily choose rhel7) # Source tarball on clean build (arbitrarily choose rhel7)
# Also, parcel up the documentation into a tar file that is easier to move around # Also, parcel up the documentation into a tar file that is easier to move around
# and labelled by the commit id it was built with. This assumes the Jenkins git plugin # and labelled by the commit id it was built with. This assumes the Jenkins git plugin
......
buildconfig/Jenkins/buildscript.bat
+ 1
− 1
View file @ f60dc350
...@@ -185,7 +185,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" ( ...@@ -185,7 +185,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
set VATES_OPT_VAL=ON set VATES_OPT_VAL=ON
) )
call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% .. call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_CPACK=ON -DWITH_PYTHON3=OFF -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% ..
if ERRORLEVEL 1 exit /B %ERRORLEVEL% if ERRORLEVEL 1 exit /B %ERRORLEVEL%
......
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