mirror of https://github.com/CGAL/cgal
Add new platforms on Windows
Now we will test VC12 (Visual Studio 2013), on 32/64, in Release/Debug. + add new file extensions to .gitignore
This commit is contained in:
Laurent Rineau
parent
9114db9085
commit
253c17e466
|
|
@ -1050,6 +1050,8 @@ Makefile
|
|||
*.manifest
|
||||
*.manifest.res
|
||||
*.vcproj
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
*.sln
|
||||
*.depends
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2010-Release-6
|
|||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2012-Release-32bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2012-Release-64bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2012-Debug-64bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2013-Release-32bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2013-Release-64bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2013-Debug-64bits"
|
||||
COMPILERS_localhost="$COMPILERS_localhost x64_Cygwin-Windows8_MSVC2013-Debug-32bits"
|
||||
|
||||
MYSHELL="bash --login"
|
||||
FTP_OPTS="-v -n"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
declare -x DevEnvDir="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\"
|
||||
declare -x ExtensionSdkDir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs"
|
||||
declare -x FSHARPINSTALLDIR="C:\\Program Files (x86)\\Microsoft SDKs\\F#\\3.1\\Framework\\v4.0\\"
|
||||
declare -x Framework40Version="v4.0"
|
||||
declare -x FrameworkDIR32="C:\\WINDOWS\\Microsoft.NET\\Framework\\"
|
||||
declare -x FrameworkDir="C:\\WINDOWS\\Microsoft.NET\\Framework\\"
|
||||
declare -x FrameworkVersion="v4.0.30319"
|
||||
declare -x FrameworkVersion32="v4.0.30319"
|
||||
declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\INCLUDE;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt;"
|
||||
declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB;C:\\Program Files (x86)\\Windows Kits\\8.1\\lib\\winv6.3\\um\\x86;"
|
||||
declare -x LIBPATH="C:\\WINDOWS\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB;C:\\Program Files (x86)\\Windows Kits\\8.1\\References\\CommonConfiguration\\Neutral;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs\\Microsoft.VCLibs\\12.0\\References\\CommonConfiguration\\neutral;"
|
||||
declare -x PATH="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/CommonExtensions/Microsoft/TestWindow:/cygdrive/c/Program Files (x86)/Microsoft SDKs/F#/3.1/Framework/v4.0:/cygdrive/c/Program Files (x86)/MSBuild/12.0/bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/Tools:/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/VCPackages:/cygdrive/c/Program Files (x86)/HTML Help Workshop:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/Team Tools/Performance Tools:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/bin/x86:/cygdrive/c/Program Files (x86)/Microsoft SDKs/Windows/v8.1A/bin/NETFX 4.5.1 Tools:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS:/cygdrive/c/WINDOWS/System32/Wbem:/cygdrive/c/WINDOWS/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files (x86)/Windows Kits/8.0/Windows Performance Toolkit:/cygdrive/c/Program Files/Microsoft SQL Server/110/Tools/Binn:/cygdrive/c/Program Files (x86)/CMake 2.8/bin:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/Windows Performance Toolkit:/cygdrive/c/Program Files (x86)/CMake 2.8/bin:/usr/bin:"
|
||||
declare -x VCINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\"
|
||||
declare -x VSINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\"
|
||||
declare -x VisualStudioVersion="12.0"
|
||||
declare -x WindowsSDK_ExecutablePath_x64="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\x64"
|
||||
declare -x WindowsSDK_ExecutablePath_x86="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\"
|
||||
declare -x WindowsSdkDir="C:\\Program Files (x86)\\Windows Kits\\8.1\\"
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
declare -x CommandPromptType="Native"
|
||||
declare -x ExtensionSdkDir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs"
|
||||
declare -x FSHARPINSTALLDIR="C:\\Program Files (x86)\\Microsoft SDKs\\F#\\3.1\\Framework\\v4.0\\"
|
||||
declare -x Framework40Version="v4.0"
|
||||
declare -x FrameworkDIR64="C:\\WINDOWS\\Microsoft.NET\\Framework64"
|
||||
declare -x FrameworkDir="C:\\WINDOWS\\Microsoft.NET\\Framework64"
|
||||
declare -x FrameworkVersion="v4.0.30319"
|
||||
declare -x FrameworkVersion64="v4.0.30319"
|
||||
declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\INCLUDE;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt;"
|
||||
declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\lib\\winv6.3\\um\\x64;"
|
||||
declare -x LIBPATH="C:\\WINDOWS\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\References\\CommonConfiguration\\Neutral;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs\\Microsoft.VCLibs\\12.0\\References\\CommonConfiguration\\neutral;"
|
||||
declare -x Platform="X64"
|
||||
declare -x VCINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\"
|
||||
declare -x VSINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\"
|
||||
declare -x VisualStudioVersion="12.0"
|
||||
declare -x WindowsSDK_ExecutablePath_x64="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\x64\\"
|
||||
declare -x WindowsSDK_ExecutablePath_x86="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\"
|
||||
declare -x WindowsSdkDir="C:\\Program Files (x86)\\Windows Kits\\8.1\\"
|
||||
|
|
@ -1,18 +1,22 @@
|
|||
#import Visual specific variables
|
||||
source "${PLATFORM_REFERENCE}/setup_VC${VC_VERSION}-${ARCH}"
|
||||
|
||||
if [ -z "${BOOST_VERSION}" ]; then
|
||||
export BOOST_VERSION=1_53_0
|
||||
fi
|
||||
|
||||
export CMAKE_GENERATOR='-GNMake Makefiles'
|
||||
export MAKE_CMD='/cygdrive/c/bin/jom/jom.exe'
|
||||
export PATH=$PATH:'/cygdrive/c/CGAL/CGAL-I/scripts:/cygdrive/c/CGAL/CGAL-I/developer_scripts'
|
||||
|
||||
#Header only libraries
|
||||
export BOOST_INCLUDEDIR="C:\3rdPartyLibs\boost_1_53_0"
|
||||
export BOOST_INCLUDEDIR="C:\3rdPartyLibs\boost_${BOOST_VERSION}"
|
||||
#export EIGEN3_DIR="C:\3rdPartyLibs\Eigen-3.1.2"
|
||||
export EIGEN3_DIR="C:\3rdPartyLibs\eigen-eigen-36bf2ceaf8f5"
|
||||
export ESBTL_DIR="C:\3rdPartyLibs\esbtl"
|
||||
|
||||
#paths depending on the architecture
|
||||
export BOOST_LIBRARYDIR="C:\3rdPartyLibs\boost_1_53_0\lib${ARCH}"
|
||||
export BOOST_LIBRARYDIR="C:\3rdPartyLibs\boost_${BOOST_VERSION}\lib${ARCH}"
|
||||
export GMP_INC_DIR="C:\3rdPartyLibs\VC-${ARCH}\gmp-5.0.1_and_mpfr-3.0.0\include"
|
||||
export GMP_LIB_DIR="C:\3rdPartyLibs\VC-${ARCH}\gmp-5.0.1_and_mpfr-3.0.0\lib"
|
||||
export MPFR_INC_DIR="C:\3rdPartyLibs\VC-${ARCH}\gmp-5.0.1_and_mpfr-3.0.0\include"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,6 @@
|
|||
export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits'
|
||||
export VC_VERSION="12"
|
||||
export ARCH="32"
|
||||
export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms"
|
||||
export BOOST_VERSION=1_55_0
|
||||
source "${PLATFORM_REFERENCE}/setup_common"
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,6 @@
|
|||
export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits'
|
||||
export VC_VERSION="12"
|
||||
export ARCH="64"
|
||||
export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms"
|
||||
export BOOST_VERSION=1_55_0
|
||||
source "${PLATFORM_REFERENCE}/setup_common"
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,6 @@
|
|||
export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits'
|
||||
export VC_VERSION="12"
|
||||
export ARCH="32"
|
||||
export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms"
|
||||
export BOOST_VERSION=1_55_0
|
||||
source "${PLATFORM_REFERENCE}/setup_common"
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,6 @@
|
|||
export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits'
|
||||
export VC_VERSION="12"
|
||||
export ARCH="64"
|
||||
export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms"
|
||||
export BOOST_VERSION=1_55_0
|
||||
source "${PLATFORM_REFERENCE}/setup_common"
|
||||
Loading…
Reference in New Issue