Skip to content

Commit 43c0278

Browse files
committed
Update setup.cfg + refactor ps script
1 parent 92a0993 commit 43c0278

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

build_dependencies/install_windows.ps1

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ It downloads, builds, installs, and then deletes:
1111
* octomap
1212
#>
1313

14+
# Remember starting location for future usage
1415
$base_dir = Get-Location
1516

1617
# Create a directory that encapsulates all dependencies
1718
mkdir -p deps; Set-Location deps
1819

20+
# Build options
21+
$generator = "Visual Studio 16 2019"
22+
1923
# All compiled depencies will be install in following folder
2024
$install_dir = "$base_dir\deps\install"
2125

@@ -30,7 +34,7 @@ Set-Location "eigen-$eigen_ver"
3034

3135
cmake -B build `
3236
-D CMAKE_BUILD_TYPE=Release `
33-
-G "Visual Studio 16 2019" `
37+
-G $generator `
3438
-D BUILD_SHARED_LIBS=ON `
3539
-D CMAKE_INSTALL_PREFIX=$install_dir
3640
cmake --install build
@@ -46,7 +50,7 @@ Set-Location libccd
4650

4751
cmake -B build `
4852
-D CMAKE_BUILD_TYPE=Release `
49-
-G "Visual Studio 16 2019" `
53+
-G $generator `
5054
-D BUILD_SHARED_LIBS=ON `
5155
-D CMAKE_INSTALL_PREFIX=$install_dir
5256
cmake --build build --config Release --target install
@@ -63,7 +67,7 @@ Set-Location octomap
6367
cmake -B build `
6468
-D CMAKE_PREFIX_PATH=$install_dir `
6569
-D CMAKE_BUILD_TYPE=Release `
66-
-G "Visual Studio 16 2019" `
70+
-G $generator `
6771
-D BUILD_SHARED_LIBS=ON `
6872
-D CMAKE_INSTALL_PREFIX=$install_dir `
6973
-D BUILD_OCTOVIS_SUBPROJECT=OFF `
@@ -82,11 +86,10 @@ Set-Location fcl
8286
cmake -B build `
8387
-D CMAKE_PREFIX_PATH=$install_dir `
8488
-D CMAKE_BUILD_TYPE=Release `
85-
-G "Visual Studio 16 2019" `
89+
-G $generator `
8690
-D CMAKE_INSTALL_PREFIX=$install_dir
8791

8892
cmake --build build --config Release --target install
89-
Write-Host "Done"
9093
Set-Location ..
9194

9295
# ------------------------------------------------------------------------------

setup.cfg

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ classifiers =
1515
Development Status :: 3 - Alpha
1616
License :: OSI Approved :: BSD License
1717
Operating System :: POSIX :: Linux
18-
Programming Language :: Python :: 2
19-
Programming Language :: Python :: 2.7
18+
Operating System :: MacOS
19+
Operating System :: Microsoft :: Windows
2020
Programming Language :: Python :: 3
21-
Programming Language :: Python :: 3.0
22-
Programming Language :: Python :: 3.1
23-
Programming Language :: Python :: 3.2
24-
Programming Language :: Python :: 3.3
25-
Programming Language :: Python :: 3.4
26-
Programming Language :: Python :: 3.5
2721
Programming Language :: Python :: 3.6
22+
Programming Language :: Python :: 3.7
23+
Programming Language :: Python :: 3.8
24+
Programming Language :: Python :: 3.9
25+
Programming Language :: Python :: Implementation :: CPython
2826
keywords = fcl collision distance
2927

3028
[options]

0 commit comments

Comments
 (0)