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
d4306647
Commit
d4306647
authored
Mar 17, 2015
by
Alexander Nitsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove local variables from CMAKE namespace
parent
13694c8a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OpenCVConfig.cmake
cmake/OpenCVConfig.cmake
+2
-2
OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+2
-2
No files found.
cmake/OpenCVConfig.cmake
View file @
d4306647
...
...
@@ -84,9 +84,9 @@ elseif(MINGW)
set
(
OpenCV_RUNTIME mingw
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpmachine
OUTPUT_VARIABLE
CMAKE_
OPENCV_GCC_TARGET_MACHINE
OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
CMAKE_
OPENCV_GCC_TARGET_MACHINE MATCHES
"amd64|x86_64|AMD64"
)
if
(
OPENCV_GCC_TARGET_MACHINE MATCHES
"amd64|x86_64|AMD64"
)
set
(
MINGW64 1
)
set
(
OpenCV_ARCH x64
)
else
()
...
...
cmake/OpenCVDetectCXXCompiler.cmake
View file @
d4306647
...
...
@@ -91,9 +91,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
if
(
WIN32
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpmachine
OUTPUT_VARIABLE
CMAKE_
OPENCV_GCC_TARGET_MACHINE
OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
CMAKE_
OPENCV_GCC_TARGET_MACHINE MATCHES
"amd64|x86_64|AMD64"
)
if
(
OPENCV_GCC_TARGET_MACHINE MATCHES
"amd64|x86_64|AMD64"
)
set
(
MINGW64 1
)
endif
()
endif
()
...
...
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