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
74329ee4
Commit
74329ee4
authored
Oct 03, 2013
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: revert CRT linkage option for MSVS
parent
034a77c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
CMakeLists.txt
CMakeLists.txt
+1
-1
CMakeLists.txt
samples/CMakeLists.txt
+20
-1
No files found.
CMakeLists.txt
View file @
74329ee4
...
...
@@ -174,7 +174,7 @@ OCV_OPTION(BUILD_PACKAGE "Enables 'make package_source' command"
OCV_OPTION
(
BUILD_PERF_TESTS
"Build performance tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_TESTS
"Build accuracy & regression tests"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
BUILD_WITH_DEBUG_INFO
"Include debug info into debug libs (not MSCV only)"
ON
)
OCV_OPTION
(
BUILD_WITH_STATIC_CRT
"Enables use of staticaly linked CRT for staticaly linked OpenCV"
O
FF
IF MSVC
)
OCV_OPTION
(
BUILD_WITH_STATIC_CRT
"Enables use of staticaly linked CRT for staticaly linked OpenCV"
O
N
IF MSVC
)
OCV_OPTION
(
BUILD_FAT_JAVA_LIB
"Create fat java wrapper containing the whole OpenCV library"
ON IF NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX
)
OCV_OPTION
(
BUILD_ANDROID_SERVICE
"Build OpenCV Manager for Google Play"
OFF IF ANDROID AND ANDROID_SOURCE_TREE
)
OCV_OPTION
(
BUILD_ANDROID_PACKAGE
"Build platform-specific package for Google Play"
OFF IF ANDROID
)
...
...
samples/CMakeLists.txt
View file @
74329ee4
...
...
@@ -36,12 +36,31 @@ find_package(OpenCV REQUIRED)
if
(
MSVC
)
add_definitions
(
-D_CRT_SECURE_NO_WARNINGS
)
if
(
NOT OpenCV_SHARED
)
foreach
(
flag_var
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
)
if
(
${
flag_var
}
MATCHES
"/MD"
)
string
(
REGEX REPLACE
"/MD"
"/MT"
${
flag_var
}
"
${${
flag_var
}}
"
)
endif
()
if
(
${
flag_var
}
MATCHES
"/MDd"
)
string
(
REGEX REPLACE
"/MDd"
"/MTd"
${
flag_var
}
"
${${
flag_var
}}
"
)
endif
()
endforeach
(
flag_var
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib"
)
set
(
CMAKE_EXE_LINKER_FLAGS_DEBUG
"
${
CMAKE_EXE_LINKER_FLAGS_DEBUG
}
/NODEFAULTLIB:libcmt.lib"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELEASE
"
${
CMAKE_EXE_LINKER_FLAGS_RELEASE
}
/NODEFAULTLIB:libcmtd.lib"
)
endif
()
endif
()
add_subdirectory
(
c
)
add_subdirectory
(
cpp
)
add_subdirectory
(
ocl
)
add_subdirectory
(
gpu
)
# FIXIT: can't use cvconfig.h in samples:
add_subdirectory(gpu)
#
# END OF BUILD CASE 2: Build samples with library binaries
...
...
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