Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
eigenpy
Commits
9a6a3710
Verified
Commit
9a6a3710
authored
4 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
cmake: use PYTHON_SITELIB
parent
4c2e5818
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.github/workflows/windows-conda.yml
+9
-1
9 additions, 1 deletion
.github/workflows/windows-conda.yml
python/CMakeLists.txt
+2
-2
2 additions, 2 deletions
python/CMakeLists.txt
with
11 additions
and
3 deletions
.github/workflows/windows-conda.yml
+
9
−
1
View file @
9a6a3710
...
...
@@ -35,8 +35,16 @@ jobs:
-G "NMake Makefiles" ^
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
-DCMAKE_BUILD_TYPE=Release ^
-D
EIGENPY
_SITELIB
_ROOT
=%CONDA_PREFIX% ^
-D
PYTHON
_SITELIB=%CONDA_PREFIX%
\Lib\site-packages
^
-DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
..
:: Build and Install
cmake --build . --config Release --target install
:: Testing
ctest --output-on-failure -C Release -V
:: Test Python import
cd ..
python -c "import eigenpy"
This diff is collapsed.
Click to expand it.
python/CMakeLists.txt
+
2
−
2
View file @
9a6a3710
...
...
@@ -19,8 +19,8 @@ TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME})
IF
(
NOT WIN32
)
TARGET_COMPILE_OPTIONS
(
${
PYWRAP
}
PRIVATE
"-Wno-conversion"
)
ENDIF
()
IF
(
EIGENPY
_SITELIB
_ROOT
)
SET
(
${
PYWRAP
}
_INSTALL_DIR
${
EIGENPY_SITELIB_ROOT
}
/
${
PYTHON_SITELIB
}
/
${
PROJECT_NAME
}
)
IF
(
IS_ABSOLUTE
${
PYTHON
_SITELIB
}
)
SET
(
${
PYWRAP
}
_INSTALL_DIR
${
PYTHON_SITELIB
}
/
${
PROJECT_NAME
}
)
ELSE
()
SET
(
${
PYWRAP
}
_INSTALL_DIR
${
CMAKE_INSTALL_PREFIX
}
/
${
PYTHON_SITELIB
}
/
${
PROJECT_NAME
}
)
ENDIF
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment