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
019122fb
Commit
019122fb
authored
Apr 24, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed dependencies for cmake status embeeded into opencv core
parent
b7aacb6a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
CMakeLists.txt
CMakeLists.txt
+2
-0
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+9
-0
CMakeLists.txt
modules/core/CMakeLists.txt
+1
-7
No files found.
CMakeLists.txt
View file @
019122fb
...
@@ -938,6 +938,8 @@ status(" cvconfig.h is in:" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}")
...
@@ -938,6 +938,8 @@ status(" cvconfig.h is in:" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}")
status
(
"-----------------------------------------------------------------"
)
status
(
"-----------------------------------------------------------------"
)
status
(
""
)
status
(
""
)
ocv_finalize_status
()
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Warn in the case of in-source build
# Warn in the case of in-source build
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
...
...
cmake/OpenCVUtils.cmake
View file @
019122fb
...
@@ -113,6 +113,15 @@ function(ocv_output_status msg)
...
@@ -113,6 +113,15 @@ function(ocv_output_status msg)
file
(
APPEND
"
${
OPENCV_BUILD_INFO_FILE
}
"
"
\"
${
msg
}
\\
n
\"\n
"
)
file
(
APPEND
"
${
OPENCV_BUILD_INFO_FILE
}
"
"
\"
${
msg
}
\\
n
\"\n
"
)
endfunction
()
endfunction
()
macro
(
ocv_finalize_status
)
if
(
NOT OPENCV_SKIP_STATUS_FINALIZATION
)
if
(
TARGET opencv_core
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
"
${
OPENCV_BUILD_INFO_FILE
}
"
"
${
opencv_core_BINARY_DIR
}
/version_string.inc"
OUTPUT_QUIET
)
endif
()
endif
()
endmacro
()
# Status report function.
# Status report function.
# Automatically align right column and selects text based on condition.
# Automatically align right column and selects text based on condition.
# Usage:
# Usage:
...
...
modules/core/CMakeLists.txt
View file @
019122fb
...
@@ -16,13 +16,7 @@ else()
...
@@ -16,13 +16,7 @@ else()
set
(
cuda_link_libs
""
)
set
(
cuda_link_libs
""
)
endif
()
endif
()
set
(
OPENCV_VERSION_FILE
"
${
opencv_core_BINARY_DIR
}
/version_string.inc"
)
ocv_glob_module_sources
(
SOURCES
${
lib_cuda
}
${
cuda_objs
}
"
${
opencv_core_BINARY_DIR
}
/version_string.inc"
)
add_custom_command
(
OUTPUT
"
${
OPENCV_VERSION_FILE
}
"
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
"
${
OPENCV_BUILD_INFO_FILE
}
"
"
${
OPENCV_VERSION_FILE
}
"
MAIN_DEPENDENCY
"
${
OPENCV_BUILD_INFO_FILE
}
"
COMMENT
""
)
ocv_glob_module_sources
(
SOURCES
${
lib_cuda
}
${
cuda_objs
}
"
${
OPENCV_VERSION_FILE
}
"
)
ocv_create_module
(
${
cuda_link_libs
}
)
ocv_create_module
(
${
cuda_link_libs
}
)
ocv_add_precompiled_headers
(
${
the_module
}
)
ocv_add_precompiled_headers
(
${
the_module
}
)
...
...
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