rpms/vxl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
vxl/0004-v2.0.2-Version-shared-objects.patch
Ankur Sinha (Ankur Sinha Gmail) 42456eece0
 Build fixed---moving on to re-porting patches
2019-04-19 10:14:36 +01:00

258 lines
12 KiB
Diff
Raw Blame History

From 2980591c7c7d178bfaa6d073e007fb8c50fec944 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 18 Apr 2019 22:11:41 +0100
Subject: [PATCH 4/4] v2.0.2 Version shared objects
---
CMakeLists.txt | 26 +++++++++++++++++++++++++-
core/testlib/CMakeLists.txt | 1 +
core/vgui/CMakeLists.txt | 1 +
core/vidl/gui/CMakeLists.txt | 1 +
core/vil/CMakeLists.txt | 1 +
core/vil/algo/CMakeLists.txt | 1 +
core/vnl/CMakeLists.txt | 1 +
core/vnl/algo/CMakeLists.txt | 1 +
core/vpdl/CMakeLists.txt | 1 +
core/vpgl/CMakeLists.txt | 1 +
core/vpgl/algo/CMakeLists.txt | 1 +
core/vpgl/file_formats/CMakeLists.txt | 1 +
core/vpgl/io/CMakeLists.txt | 1 +
core/vpgl/xio/CMakeLists.txt | 1 +
v3p/netlib/CMakeLists.txt | 4 ++++
vcl/CMakeLists.txt | 2 ++
16 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..b6cf7dfcdecb57929a266c466c1105948d17c7b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,34 @@ foreach(p
endforeach()
project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
- VERSION 2.0.2.0
DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
LANGUAGES CXX C)
+SET(VXL_MAJOR_VERSION 2)
+SET(VXL_MINOR_VERSION 0)
+SET(VXL_BUILD_VERSION 2)
+SET(VXL_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
+SET(VXL_API_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
+SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
+ SOVERSION "${VXL_API_VERSION}")
+
+SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VIL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VIL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPGL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPGL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPGL_FILE_FORMATS_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPGL_IO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPGL_XIO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VIDLGUI_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+SET(VPDL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
+
include(CMakeDependentOption)
include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
diff --git a/core/testlib/CMakeLists.txt b/core/testlib/CMakeLists.txt
index 0dd61806dbf68ddc953b0284eff8bc37ddf0c247..2833f468acff665622c6cbf9467d0e6299cea586 100644
--- a/core/testlib/CMakeLists.txt
+++ b/core/testlib/CMakeLists.txt
@@ -33,6 +33,7 @@ set(testlib_sources
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}testlib
LIBRARY_SOURCES ${testlib_sources}
HEADER_INSTALL_DIR core/testlib)
+set_target_properties(${VXL_LIB_PREFIX}testlib PROPERTIES ${TESTLIB_LIBRARY_PROPERTIES})
target_link_libraries(${VXL_LIB_PREFIX}testlib ${VXL_LIB_PREFIX}vcl)
if( BUILD_TESTING )
diff --git a/core/vgui/CMakeLists.txt b/core/vgui/CMakeLists.txt
index fe1ecd4ec2debf573ec2eddf455c81129da88d70..9c6ed4abf45513eeb94ba4ac3a78575c89b3a7bc 100644
--- a/core/vgui/CMakeLists.txt
+++ b/core/vgui/CMakeLists.txt
@@ -525,6 +525,7 @@ set( vgui_sources ${vgui_sources}
)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vgui LIBRARY_SOURCES ${vgui_sources})
+SET_TARGET_PROPERTIES(${VXL_LIB_PREFIX}vgui PROPERTIES ${VGUI_LIBRARY_PROPERTIES})
set( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
# Dependencies on other vxl libraries
diff --git a/core/vidl/gui/CMakeLists.txt b/core/vidl/gui/CMakeLists.txt
index 138372f69bc5ca44b7180805a2036660ffb7e5c1..85d574a89073e5039373533891f717c6b0432424 100644
--- a/core/vidl/gui/CMakeLists.txt
+++ b/core/vidl/gui/CMakeLists.txt
@@ -12,6 +12,7 @@ set(vidl_gui_sources
)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vidl_gui LIBRARY_SOURCES ${vidl_gui_sources})
+set_target_properties(${VXL_LIB_PREFIX}vidl_gui PROPERTIES ${VIDLGUI_LIBRARY_PROPERTIES})
target_link_libraries( ${VXL_LIB_PREFIX}vidl_gui ${VXL_LIB_PREFIX}vidl ${VXL_LIB_PREFIX}vgui ${VXL_LIB_PREFIX}vil )
if( BUILD_TESTING )
diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
index 61672fe90edf7db26010613a2635ec355c8cf626..2734909d70af7c0d3c94febee8efe6aad6b1b666 100644
--- a/core/vil/CMakeLists.txt
+++ b/core/vil/CMakeLists.txt
@@ -335,6 +335,7 @@ set( vil_network_sources
)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil LIBRARY_SOURCES ${vil_sources} ${vil_network_sources})
+set_target_properties(${VXL_LIB_PREFIX}vil PROPERTIES ${VIL_LIBRARY_PROPERTIES})
if(JPEG_FOUND)
target_link_libraries( ${VXL_LIB_PREFIX}vil ${JPEG_LIBRARIES} )
diff --git a/core/vil/algo/CMakeLists.txt b/core/vil/algo/CMakeLists.txt
index ee68c9106bbdefadc7b49a3eeee0ea5854b5160d..2b9a71f4303a073ddc2ae5e2b79d6988b512cc50 100644
--- a/core/vil/algo/CMakeLists.txt
+++ b/core/vil/algo/CMakeLists.txt
@@ -57,6 +57,7 @@ set( vil_algo_sources
aux_source_directory(Templates vil_algo_sources)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vil_algo LIBRARY_SOURCES ${vil_algo_sources})
+set_target_properties(${VXL_LIB_PREFIX}vil_algo PROPERTIES ${VIL_ALGO_LIBRARY_PROPERTIES})
target_link_libraries( ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
diff --git a/core/vnl/CMakeLists.txt b/core/vnl/CMakeLists.txt
index 6388a7f4a7b277cf2df4926300c69b66fb038008..d40871b9ec8c0ce8fee2d82f787f478ed0749c6d 100644
--- a/core/vnl/CMakeLists.txt
+++ b/core/vnl/CMakeLists.txt
@@ -268,6 +268,7 @@ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl
LIBRARY_SOURCES ${vnl_sources}
HEADER_INSTALL_DIR vnl)
target_link_libraries( ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vcl )
+set_target_properties(${VXL_LIB_PREFIX}vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
set(_curr_lib_name vnl)
# If VXL_INSTALL_INCLUDE_DIR is the default value
if("${VXL_INSTALL_INCLUDE_DIR}" STREQUAL "include/vxl")
diff --git a/core/vnl/algo/CMakeLists.txt b/core/vnl/algo/CMakeLists.txt
index 1666a0e089c74ba1212c7ccd0743c79b1ed420fe..a326fd6aea06fd26e6ae838b652d97f078bd8ae1 100644
--- a/core/vnl/algo/CMakeLists.txt
+++ b/core/vnl/algo/CMakeLists.txt
@@ -111,6 +111,7 @@ if(NETLIB_FOUND)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vnl_algo
LIBRARY_SOURCES ${vnl_algo_sources}
HEADER_INSTALL_DIR vnl/algo)
+ set_target_properties(${VXL_LIB_PREFIX}vnl_algo PROPERTIES ${VNL_ALGO_LIBRARY_PROPERTIES})
target_link_libraries( ${VXL_LIB_PREFIX}vnl_algo ${NETLIB_LIBRARIES} ${VXL_LIB_PREFIX}vnl )
set(CURR_LIB_NAME vnl_algo)
set_vxl_library_properties(
diff --git a/core/vpdl/CMakeLists.txt b/core/vpdl/CMakeLists.txt
index 2ea8d4e2b64b33b87ca706394c5afae7a9446b78..eca0c4f010746278969d1992c27de914e82c0e1f 100644
--- a/core/vpdl/CMakeLists.txt
+++ b/core/vpdl/CMakeLists.txt
@@ -50,6 +50,7 @@ aux_source_directory(Templates vpdl_sources)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpdl LIBRARY_SOURCES ${vpdl_sources})
+set_target_properties(${VXL_LIB_PREFIX}vpdl PROPERTIES ${VPDL_LIBRARY_PROPERTIES})
target_link_libraries( ${VXL_LIB_PREFIX}vpdl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl )
set(CURR_LIB_NAME vpdl)
set_vxl_library_properties(
diff --git a/core/vpgl/CMakeLists.txt b/core/vpgl/CMakeLists.txt
index 6b3589f61c4a29af52d77ffec73258b823505079..ae1e74dba44eecaf96c48156ccf0b6f679076f3c 100644
--- a/core/vpgl/CMakeLists.txt
+++ b/core/vpgl/CMakeLists.txt
@@ -35,6 +35,7 @@ aux_source_directory(Templates vpgl_sources)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl LIBRARY_SOURCES ${vpgl_sources})
+set_target_properties(${VXL_LIB_PREFIX}vpgl PROPERTIES ${VPGL_LIBRARY_PROPERTIES})
target_link_libraries(${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vbl)
set(CURR_LIB_NAME vpgl)
set_vxl_library_properties(
diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
index ab762c300616bd81b6de331acec8007d03102c19..97e50096c35b086e76b62a5de621637d3cfbc92f 100644
--- a/core/vpgl/algo/CMakeLists.txt
+++ b/core/vpgl/algo/CMakeLists.txt
@@ -43,6 +43,7 @@ endif()
aux_source_directory(Templates vpgl_algo_sources)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_algo LIBRARY_SOURCES ${vpgl_algo_sources})
+set_target_properties(${VXL_LIB_PREFIX}vpgl_algo PROPERTIES ${VPGL_ALGO_LIBRARY_PROPERTIES})
target_link_libraries(${VXL_LIB_PREFIX}vpgl_algo ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl)
diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
index cd33c8ec2bc94558274a95f1fbebf4faecafcd1b..5a1c40bd089049dace2a04e7db7385ceab2c3d84 100644
--- a/core/vpgl/file_formats/CMakeLists.txt
+++ b/core/vpgl/file_formats/CMakeLists.txt
@@ -21,6 +21,7 @@ if(TIFF_FOUND)
endif()
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_file_formats LIBRARY_SOURCES ${vpgl_file_formats_sources})
+set_target_properties(${VXL_LIB_PREFIX}vpgl_file_formats PROPERTIES ${VPGL_FILE_FORMATS_LIBRARY_PROPERTIES})
target_link_libraries(${VXL_LIB_PREFIX}vpgl_file_formats ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl)
diff --git a/core/vpgl/io/CMakeLists.txt b/core/vpgl/io/CMakeLists.txt
index eeaeef11a2055cc533e54469749d450aecbf085d..1204f88d373db213d793702f66f0f47926aa0a60 100644
--- a/core/vpgl/io/CMakeLists.txt
+++ b/core/vpgl/io/CMakeLists.txt
@@ -13,6 +13,7 @@ set(vpgl_io_sources
aux_source_directory(Templates vpgl_io_sources)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_io LIBRARY_SOURCES ${vpgl_io_sources})
+set_target_properties(${VXL_LIB_PREFIX}vpgl_io PROPERTIES ${VPGL_IO_LIBRARY_PROPERTIES})
target_link_libraries(${VXL_LIB_PREFIX}vpgl_io ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vnl_io ${VXL_LIB_PREFIX}vbl_io)
diff --git a/core/vpgl/xio/CMakeLists.txt b/core/vpgl/xio/CMakeLists.txt
index 4019d294eec7cada19ad7c2ef601b2b61f8fd9ef..8c367dc41ad8a0f79fed236da2f8e9079114c1dd 100644
--- a/core/vpgl/xio/CMakeLists.txt
+++ b/core/vpgl/xio/CMakeLists.txt
@@ -5,6 +5,7 @@ set(vpgl_xio_sources
)
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vpgl_xio LIBRARY_SOURCES ${vpgl_xio_sources} )
+set_target_properties(${VXL_LIB_PREFIX}vpgl_xio PROPERTIES ${VPGL_XIO_LIBRARY_PROPERTIES})
target_link_libraries( ${VXL_LIB_PREFIX}vpgl_xio ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vsl )
if(BUILD_TESTING)
diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
index 726a25a834893f8f051fbe627c490c52cc3af2b6..e670609dd775b7b092dfb1e10389832f1d1b69dd 100644
--- a/v3p/netlib/CMakeLists.txt
+++ b/v3p/netlib/CMakeLists.txt
@@ -9,6 +9,8 @@ set(netlib_sources
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}netlib
LIBRARY_SOURCES ${netlib_sources})
+set_target_properties(${VXL_LIB_PREFIX}netlib
+ PROPERTIES ${NETLIB_LIBRARY_PROPERTIES})
if(UNIX)
target_link_libraries( ${VXL_LIB_PREFIX}netlib m )
@@ -437,6 +439,8 @@ endif()
# Create a netlib library with mangled symbols.
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}v3p_netlib
LIBRARY_SOURCES ${v3p_netlib_sources})
+set_target_properties(${VXL_LIB_PREFIX}v3p_netlib
+ PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
if(UNIX)
target_link_libraries(${VXL_LIB_PREFIX}v3p_netlib m)
endif()
diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
index dd83858d156fe2d9c9c2a0dfbdac016ec6af582c..d6b92ed8395f5df2eb312ae19387e8ebed5367b4 100644
--- a/vcl/CMakeLists.txt
+++ b/vcl/CMakeLists.txt
@@ -193,6 +193,8 @@ set( vcl_sources
vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}vcl
LIBRARY_SOURCES ${vcl_sources}
)
+set_target_properties(${VXL_LIB_PREFIX}vcl
+ PROPERTIES ${VCL_LIBRARY_PROPERTIES})
if(UNIX)
target_link_libraries(${VXL_LIB_PREFIX}vcl m)
endif()
--
2.21.0
Reference in a new issue View git blame Copy permalink