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
9dfb15db
Commit
9dfb15db
authored
Dec 05, 2010
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some more fixes for the static library configuration
parent
0de9c9fd
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
10 deletions
+28
-10
CMakeLists.txt
3rdparty/lapack/CMakeLists.txt
+1
-6
CMakeLists.txt
3rdparty/libjasper/CMakeLists.txt
+6
-0
CMakeLists.txt
3rdparty/libjpeg/CMakeLists.txt
+6
-0
CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
+6
-0
CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
+5
-0
CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
+1
-3
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVConfig.cmake.in
OpenCVConfig.cmake.in
+2
-0
No files found.
3rdparty/lapack/CMakeLists.txt
View file @
9dfb15db
...
@@ -62,13 +62,8 @@ set_target_properties(${the_target}
...
@@ -62,13 +62,8 @@ set_target_properties(${the_target}
)
)
if
(
NOT BUILD_SHARED_LIBS
)
if
(
NOT BUILD_SHARED_LIBS
)
set_target_properties
(
${
the_target
}
PROPERTIES INSTALL_NAME_DIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
install
(
TARGETS
${
the_target
}
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
LIBRARY DESTINATION lib COMPONENT main
ARCHIVE DESTINATION lib COMPONENT main
)
endif
()
endif
()
endif
()
#android
endif
()
#android
3rdparty/libjasper/CMakeLists.txt
View file @
9dfb15db
...
@@ -57,4 +57,10 @@ set_target_properties(${the_target}
...
@@ -57,4 +57,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
)
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
(
ANDROID
)
#!android
endif
(
ANDROID
)
#!android
3rdparty/libjpeg/CMakeLists.txt
View file @
9dfb15db
...
@@ -47,4 +47,10 @@ set_target_properties(${the_target}
...
@@ -47,4 +47,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/3rdparty/lib
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/3rdparty/lib
)
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
()
#android
endif
()
#android
3rdparty/libpng/CMakeLists.txt
View file @
9dfb15db
...
@@ -41,4 +41,10 @@ set_target_properties(${the_target}
...
@@ -41,4 +41,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
)
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
()
#android
endif
()
#android
3rdparty/libtiff/CMakeLists.txt
View file @
9dfb15db
...
@@ -99,3 +99,8 @@ set_target_properties(${the_target}
...
@@ -99,3 +99,8 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib/"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib/"
)
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
3rdparty/zlib/CMakeLists.txt
View file @
9dfb15db
...
@@ -40,10 +40,8 @@ set_target_properties(${the_target}
...
@@ -40,10 +40,8 @@ set_target_properties(${the_target}
)
)
if
(
NOT BUILD_SHARED_LIBS
)
if
(
NOT BUILD_SHARED_LIBS
)
set_target_properties
(
${
the_target
}
PROPERTIES INSTALL_NAME_DIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
install
(
TARGETS
${
the_target
}
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION lib COMPONENT main
)
ARCHIVE DESTINATION
share/opencv/3rdparty/
lib COMPONENT main
)
endif
()
endif
()
endif
(
ANDROID
)
endif
(
ANDROID
)
CMakeLists.txt
View file @
9dfb15db
...
@@ -490,7 +490,7 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
...
@@ -490,7 +490,7 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
set
(
JASPER_LIBRARIES libjasper
)
set
(
JASPER_LIBRARIES libjasper
)
endif
()
endif
()
message
(
STATUS
"Graphic libraries:
${
PNG_LIBRARIES
}
${
JPEG_LIBRARIES
}
${
TIFF_LIBRARIES
}
${
JASPER_LIBRARIES
}
"
)
#
message(STATUS "Graphic libraries: ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES}")
if
(
WITH_OPENEXR
)
if
(
WITH_OPENEXR
)
include
(
OpenCVFindOpenEXR.cmake
)
include
(
OpenCVFindOpenEXR.cmake
)
...
...
OpenCVConfig.cmake.in
View file @
9dfb15db
...
@@ -85,6 +85,8 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
...
@@ -85,6 +85,8 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
if(WIN32)
if(WIN32)
LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
else()
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../share/opencv/3rdparty/lib)
endif()
endif()
set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
...
...
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