Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix conda package in windows #326

Merged
merged 1 commit into from
Jun 27, 2018
Merged

Conversation

massich
Copy link
Contributor

@massich massich commented Jun 27, 2018

this is a temporal solution to #324 and in order to fix

it should be combined with the following path that needs to be added to the conda-recipy:

diff --git a/wrapping/src/CMakeLists.txt b/wrapping/src/CMakeLists.txt
index d636303c..3d281f47 100644
--- a/wrapping/src/CMakeLists.txt
+++ b/wrapping/src/CMakeLists.txt
@@ -61,7 +61,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} "-c" "from distutils.sysconfig impo
                 OUTPUT_VARIABLE PYTHON_SITE_ARCH
                 RESULT_VARIABLE PYTHON_SITEARCH_NOT_FOUND)
 #extract correctly python location: e.g lib64/python2.7/site-packages
-string(REGEX MATCH "[Ll]ib.*site-packages" PYTHON_REL_SITE_ARCH ${PYTHON_SITE_ARCH})
+set(PYTHON_REL_SITE_ARCH "${CMAKE_INSTALL_PREFIX}/../Lib/site-packages/")
 
 install(TARGETS  "_openmeeg"
         LIBRARY DESTINATION ${PYTHON_REL_SITE_ARCH}

@massich massich changed the title grup all includes in OpenMEEG folder fix conda package in windows Jun 27, 2018
@codecov
Copy link

codecov bot commented Jun 27, 2018

Codecov Report

Merging #326 into master will decrease coverage by 0.39%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #326     +/-   ##
=========================================
- Coverage   65.36%   64.96%   -0.4%     
=========================================
  Files          87       87             
  Lines        6291     6331     +40     
=========================================
+ Hits         4112     4113      +1     
- Misses       2179     2218     +39
Impacted Files Coverage Δ
OpenMEEG/include/GeometryExceptions.H 8.92% <0%> (-8.93%) ⬇️
OpenMEEG/include/mesh.h 53.84% <0%> (-3.3%) ⬇️
OpenMEEGMaths/include/Exceptions.H 8.1% <0%> (-0.47%) ⬇️
OpenMEEG/include/FileExceptions.H 0% <0%> (ø) ⬆️
OpenMEEG/src/mesh.cpp 41.62% <0%> (+0.15%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ab4ae10...b7bb649. Read the comment docs.

@agramfort
Copy link
Contributor

works like a charm!

shall I merge?

@massich
Copy link
Contributor Author

massich commented Jun 27, 2018 via email

@agramfort agramfort merged commit 8b7c02b into openmeeg:master Jun 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants