Skip to content

Commit b794582

Browse files
committed
Merge pull request opencv#8175 from alalek:cmake_cleanup_defines
2 parents 1e11657 + 8633ef4 commit b794582

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

modules/highgui/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ if(APPLE)
138138
add_apple_compiler_options(the_module)
139139
endif()
140140

141-
if(BUILD_SHARED_LIBS)
142-
add_definitions(-DHIGHGUI_EXPORTS)
143-
endif()
144-
145141
if(MSVC)
146142
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
147143
endif()

modules/imgcodecs/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ if(APPLE)
116116
add_apple_compiler_options(the_module)
117117
endif()
118118

119-
if(BUILD_SHARED_LIBS)
120-
add_definitions(-DIMGCODECS_EXPORTS)
121-
endif()
122-
123119
if(MSVC)
124120
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
125121
endif()

modules/videoio/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@ if(APPLE)
244244
add_apple_compiler_options(the_module)
245245
endif()
246246

247-
if(BUILD_SHARED_LIBS)
248-
add_definitions(-DVIDEOIO_EXPORTS)
249-
endif()
250-
251247
if(MSVC)
252248
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
253249
endif()

0 commit comments

Comments
 (0)