mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 19:20:28 +08:00
Merge pull request #1771 from kiranpradeep:2.4
This commit is contained in:
commit
0ac61240c5
@ -66,7 +66,9 @@ foreach(m ${OPENCV_MODULE_${the_module}_DEPS})
|
||||
endif()
|
||||
endif()
|
||||
string(REPLACE ".." "__" srcname "${srcname}")
|
||||
get_filename_component(srcname_we ${srcname} NAME_WE)
|
||||
#NAME_WE intentionally not used since it interprets first period as start of extension (http://cmake.org/Bug/view.php?id=12282)
|
||||
get_filename_component(srcname_we "${srcname}" NAME)
|
||||
string(REGEX REPLACE "\\.[^.]+$" "" srcname_we "${srcname_we}")
|
||||
string(REGEX REPLACE <SRC_NAME_WE> "${srcname_we}" objpath2 "${objpath1}")
|
||||
string(REGEX REPLACE <RELATIVE_SRC_NAME> "${srcname}" objpath3 "${objpath2}")
|
||||
endif()
|
||||
@ -92,7 +94,9 @@ macro(ios_include_3party_libs)
|
||||
endif()
|
||||
|
||||
string(REPLACE ".." "__" srcname "${srcname}")
|
||||
get_filename_component(srcname_we ${srcname} NAME_WE)
|
||||
#NAME_WE intentionally not used since it interprets first period as start of extension (http://cmake.org/Bug/view.php?id=12282)
|
||||
get_filename_component(srcname_we "${srcname}" NAME)
|
||||
string(REGEX REPLACE "\\.[^.]+$" "" srcname_we "${srcname_we}")
|
||||
string(REGEX REPLACE <SRC_NAME_WE> "${srcname_we}" objpath2 "${objpath1}")
|
||||
string(REGEX REPLACE <RELATIVE_SRC_NAME> "${srcname}" objpath3 "${objpath2}")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user