Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
a3d3532c
Unverified
Commit
a3d3532c
authored
Jun 11, 2020
by
Justin Carpentier
Committed by
GitHub
Jun 11, 2020
Browse files
Merge pull request #1236 from jcarpent/devel
Fix packaging issue on Windows
parents
a77d983b
d2c3ca15
Changes
2
Hide whitespace changes
Inline
Side-by-side
.github/workflows/windows-conda.yml
View file @
a3d3532c
...
...
@@ -44,11 +44,10 @@ jobs:
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
::
start b
uilding
::
B
uilding
mkdir build
pushd build
set PKG_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig:%CONDA_PREFIX%\Library\share\pkgconfig
cmake ^
-G "Visual Studio 16 2019" -T "ClangCl" -DCMAKE_GENERATOR_PLATFORM=x64 ^
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
...
...
@@ -58,5 +57,7 @@ jobs:
-DBUILD_WITH_URDF_SUPPORT=ON -DBUILD_PYTHON_INTERFACE=ON ^
..
cmake --build . --config Release --target install
:: Testing
set PATH=%PATH%;%CONDA_PREFIX%\Library\lib;%CONDA_PREFIX%\Lib\site-packages\pinocchio
ctest --output-on-failure -C Release
ctest --output-on-failure -C Release
-V
src/CMakeLists.txt
View file @
a3d3532c
...
...
@@ -58,6 +58,10 @@ ADD_HEADER_GROUP(HEADERS)
ADD_SOURCE_GROUP
(
${
PROJECT_NAME
}
_SOURCES
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
EXPORT
${
TARGETS_EXPORT_NAME
}
PUBLIC_HEADER DESTINATION
${
CMAKE_INSTALL_FULL_INCLUDEDIR
}
INCLUDES DESTINATION
${
CMAKE_INSTALL_FULL_INCLUDEDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
RUNTIME DESTINATION
${
CMAKE_INSTALL_FULL_BINDIR
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment