move drishti_merge_libraries cmake feature to subdir (#741)

* add license headers and move drishti_merge_libraries to subdirectory

* add license header to merge feature support files

* move support files for merge feature to merge subdir

CMakeLists.txt

@@ -61,10 +61,13 @@ option(DRISHTI_BUILD_MERGED_SDK "Merge all static dependencies" OFF)
 option(DRISHTI_COPY_3RDPARTY_LICENSES "Install 3rd party licenses" ON)
 
 if(DRISHTI_BUILD_MERGED_SDK)
+
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/merge")
   # Override the drishti-upload DRISHTI_BUILD_OPENCV_WORLD option, since the opencv_world
   # library contains duplicate object filenames that prevents a successful split + merge
   # due to limitations in the ar utility.
   option(DRISHTI_BUILD_OPENCV_WORLD "Build OpenCV world (monolithic lib)" OFF)
+
 endif()
 
 option(DRISHTI_BUILD_ACF "Drishti ACF lib" ON)

cmake/Modules/drishti_get_library_location.cmake → cmake/Modules/merge/drishti_get_library_location.cmake

@@ -1,3 +1,11 @@
+# @file   drishti_get_library_location.cmake
+# @brief  CMake script to return the location of a library target.
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 include(CMakeParseArguments) # cmake_parse_arguments
 
 function(drishti_get_library_location)

cmake/Modules/drishti_merge_get_all_dependencies.cmake → cmake/Modules/merge/drishti_merge_get_all_dependencies.cmake

@@ -1,3 +1,11 @@
+# @file   drishti_merge_librariers_ar_ranlib.cmake
+# @brief  CMake script to recursively collect dependencies for a tyarget.
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.
+#
+# This is a helper routine for drishti_merge_libraries.cmake}
+
 include(drishti_merge_print)
 
 include(CMakeParseArguments) # cmake_parse_arguments

cmake/Modules/drishti_merge_libraries.cmake → cmake/Modules/merge/drishti_merge_libraries.cmake

@@ -1,3 +1,9 @@
+# @file   drishti_merge_librariers.cmake
+# @brief  CMake scripts to recursively gather deps, split to .o files, and merge to mega *.a
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+
 include(CMakeParseArguments) # cmake_parse_arguments
 
 cmake_policy(SET CMP0026 OLD) # drishti_merge_libraries_msvc use LOCATION

cmake/Modules/drishti_merge_libraries_ar_ranlib.cmake → cmake/Modules/merge/drishti_merge_libraries_ar_ranlib.cmake

@@ -1,3 +1,11 @@
+# @file   drishti_merge_librariers_ar_ranlib.cmake
+# @brief  CMake scripts to merge static dependencies using ar/ranlib.
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 include(CMakeParseArguments) # cmake_parse_arguments
 
 function(drishti_merge_libraries_ar_ranlib)

cmake/Modules/drishti_merge_libraries_msvc.cmake → cmake/Modules/merge/drishti_merge_libraries_msvc.cmake

@@ -1,3 +1,11 @@
+# @file   drishti_merge_librariers_ar_ranlib.cmake
+# @brief  CMake scripts to merge static dependencies w/ MSVC.
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 include(CMakeParseArguments) # cmake_parse_arguments
 
 include(drishti_get_library_location)

cmake/Modules/drishti_merge_libraries_xcode.cmake → cmake/Modules/merge/drishti_merge_libraries_xcode.cmake

@@ -1,3 +1,11 @@
+# @file   drishti_merge_librariers_ar_ranlib.cmake
+# @brief  CMake script to merge static dependencies w/ xcode.
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 include(CMakeParseArguments) # cmake_parse_arguments
 
 function(drishti_merge_libraries_xcode)

cmake/Modules/merge/drishti_merge_print.cmake

@@ -0,0 +1,11 @@
+# @file   drishti_merge_librariers_ar_ranlib.cmake
+# @brief  Print helper
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
+function(drishti_merge_print)
+  message("[merge static] " ${ARGV})
+endfunction()

cmake/Modules/script/append.cmake → cmake/Modules/merge/script/append.cmake

@@ -1,3 +1,11 @@
+# @file   append.cmake
+# @brief  CMake helper to append libs to master list
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 cmake_minimum_required(VERSION 3.1)
 
 if("${LIBRARIES_LIST}" STREQUAL "")

cmake/Modules/script/create_by_ar_ranlib.cmake → cmake/Modules/merge/script/create_by_ar_ranlib.cmake

@@ -1,3 +1,11 @@
+# @file   create_by_ar_ranlib.cmake
+# @brief  Use CMAKE_AR and CMAKE_RANLIB to create a single static lib
+#
+# \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+# \license{This project is released under the 3 Clause BSD License.}
+#
+# This is a helper routine for drishti_merge_libraries.cmake
+
 cmake_minimum_required(VERSION 3.1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/../drishti_merge_print.cmake")

cmake/Modules/merge/source/foo.cpp

@@ -0,0 +1,12 @@
+/**
+  @file   foo.cpp
+  @brief  dummy/empty c++ function for drishti_merge_libraries 
+  
+  \copyright Copyright 2014-2018 Elucideye, Inc. All rights reserved.
+  \license{This project is released under the 3 Clause BSD License.}
+
+  CMake add_library() requires at least one source file.
+*/
+
+void drishti_merge_static_libraries_dummy_function() {
+}

src/lib/drishti/CMakeLists.txt

@@ -299,10 +299,6 @@ target_compile_definitions(${drishti_api_name} PUBLIC _USE_MATH_DEFINES) # defin
 target_link_libraries(${drishti_api_name} PRIVATE "${drishti_sdk_libs}")
 list(APPEND drishti_interface_libs ${drishti_api_name})
 
-generate_export_header(drishti
-  EXPORT_FILE_NAME "${drishti_export_header}"
-)
-
 # Append drishti subdirectory for installed headers
 set(drishti_include_install_dir "${drishti_include_install_dir}/${drishti_api_name}")
 
@@ -357,6 +353,10 @@ elseif(DRISHTI_BUILD_MERGED_SDK)
   list(APPEND drishti_interface_libs drishti)
 endif()
 
+generate_export_header(drishti
+  EXPORT_FILE_NAME "${drishti_export_header}"
+)
+
 # ALIAS target allow us to have same interface while including project
 add_library(drishti::drishti ALIAS drishti)