Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
db0dcaff
Commit
db0dcaff
authored
Jul 07, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed #1204
parent
5bb8076d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
CMakeLists.txt
+5
-4
No files found.
CMakeLists.txt
View file @
db0dcaff
...
...
@@ -643,8 +643,11 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} --version
string
(
REGEX MATCH
"[0-9]+.[0-9]+"
PYTHON_VERSION_MAJOR_MINOR
"
${
PYTHON_VERSION_FULL
}
"
)
if
(
CMAKE_HOST_UNIX
)
set
(
PYTHON_PLUGIN_INSTALL_PATH lib/python
${
PYTHON_VERSION_MAJOR_MINOR
}
/site-packages/opencv
)
if
(
CMAKE_HOST_APPLE
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"from distutils.sysconfig import *; print get_python_lib()"
RESULT_VARIABLE PYTHON_CVPY_PROCESS
OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
"
${
PYTHON_STD_PACKAGES_PATH
}
"
MATCHES
"site-packages"
)
set
(
PYTHON_PACKAGES_PATH lib/python
${
PYTHON_VERSION_MAJOR_MINOR
}
/site-packages CACHE PATH
"Where to install the python packages."
)
else
()
#debian based assumed, install to the dist-packages.
set
(
PYTHON_PACKAGES_PATH lib/python
${
PYTHON_VERSION_MAJOR_MINOR
}
/dist-packages CACHE PATH
"Where to install the python packages."
)
...
...
@@ -652,7 +655,6 @@ if(CMAKE_HOST_UNIX)
endif
()
if
(
CMAKE_HOST_WIN32
)
get_filename_component
(
PYTHON_PATH
"[HKEY_LOCAL_MACHINE
\\
SOFTWARE
\\
Python
\\
PythonCore
\\
${
PYTHON_VERSION_MAJOR_MINOR
}
\\
InstallPath]"
ABSOLUTE CACHE
)
set
(
PYTHON_PLUGIN_INSTALL_PATH
"
${
PYTHON_PATH
}
/Lib/site-packages/opencv"
)
set
(
PYTHON_PACKAGES_PATH
"
${
PYTHON_PATH
}
/Lib/site-packages"
)
endif
()
...
...
@@ -781,7 +783,6 @@ endif()
if
(
WITH_TBB
)
if
(
UNIX AND NOT APPLE AND NOT ANDROID
)
PKG_CHECK_MODULES
(
TBB tbb
)
message
(
STATUS
"TBB detected:
${
TBBLIB_FOUND
}
"
)
if
(
TBB_FOUND
)
set
(
HAVE_TBB 1
)
...
...
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