Merge branch 'develop' of https://github.com/david-cattermole/mayaMatchMoveSolver into develop

Author: david-cattermole

lib/CMakeLists.txt

@@ -19,43 +19,6 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-
-# The "project" command will overwrite the "VERSION" variables. We set
-# the VERSION variables after the "project" command, so it should not
-# affect us.
-#
-# https://cmake.org/cmake/help/latest/policy/CMP0048.html
-cmake_policy(SET CMP0048 NEW)
-
-# # Honor visibility properties for all target types.
-# #
-# # https://cmake.org/cmake/help/latest/policy/CMP0063.html
-# cmake_policy(SET CMP0063 NEW)
-
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
-  # Changes how timestamps of downloaded files with
-  # ExternalProject_Add() are set.
-  #
-  # https://cmake.org/cmake/help/latest/policy/CMP0135.html
-  cmake_policy(SET CMP0135 NEW)
-endif()
-
-# Do not allow using GNU extensions (such as '-std=g++11'), because
-# it's not compatible with Maya.
-set(CXX_EXTENSIONS OFF)
-
-# Project configuration.
-project(mmsolverlibs)
-set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 1)
-set(PROJECT_VERSION_PATCH 0)
-set(PROJECT_VERSION_TWEAK 0)
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
-set(PROJECT_HOMEPAGE_URL "https://github.com/david-cattermole/mayaMatchMoveSolver")
-set(PROJECT_DESCRIPTION "mmSolver libraries.")
-set(PROJECT_AUTHOR "David Cattermole")
-set(PROJECT_COPYRIGHT "2023, 2024, David Cattermole.")
-
 # TODO: This relies on the '${mmsolverlibs_rust_DIR}' variable being set,
 # which is not ideal at all. Instead this should be a default value
 # (such as "/path/to/rust/build/directory/").
@@ -116,6 +79,3 @@ if (MMSOLVERLIBS_BUILD_TESTS)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppbind/mmimage/tests)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppbind/mmscenegraph/tests)
 endif()
-
-include(MMCommonUtils)
-mm_common_add_install_target("mmsolverlibs_cpp" ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in)

lib/cppbind/mmimage/tests/CMakeLists.txt

@@ -55,5 +55,3 @@ target_include_directories(${target_test_exe_name}
 include(MMColorIOUtils)
 mmcolorio_find_packages()
 mmcolorio_target_link_packages(${target_test_exe_name})
-
-install(TARGETS ${target_test_exe_name})

lib/cppbind/mmlens/tests/CMakeLists.txt

@@ -63,5 +63,3 @@ target_include_directories(${target_test_exe_name}
 include(MMColorIOUtils)
 mmcolorio_find_packages()
 mmcolorio_target_link_packages(${target_test_exe_name})
-
-install(TARGETS ${target_test_exe_name})

lib/cppbind/mmscenegraph/tests/CMakeLists.txt

@@ -52,5 +52,3 @@ target_include_directories(${target_test_exe_name}
 include(MMColorIOUtils)
 mmcolorio_find_packages()
 mmcolorio_target_link_packages(${target_test_exe_name})
-
-install(TARGETS ${target_test_exe_name})

lib/mmsolverlibs/src/CMakeLists.txt

@@ -120,14 +120,12 @@ target_link_libraries(${cpp_lib_name}
 # ldpk to be installed so we have the 'ldpk_INCLUDE_DIR' variable.
 add_dependencies(${cpp_lib_name} ldpk::ldpk)
 
-# Link cminpack dependency
+# Add dependencies.
 target_link_libraries(${cpp_lib_name}
-  PUBLIC cminpack::cminpack
-)
-
-# Link OpenMVG dependency for SFM functions
-target_link_libraries(${cpp_lib_name}
-  PUBLIC openMVG
+  PUBLIC cminpack::cminpack  # for small/medium optimization problems.
+  PUBLIC openMVG             # for SFM functions.
+  PUBLIC glog::glog          # required by Ceres for logging.
+  PUBLIC ceres::ceres        # for large scale optimization problems.
 )
 
 # MM Color IO dependencies
@@ -147,18 +145,3 @@ target_include_directories(${cpp_lib_name}
   PRIVATE $<BUILD_INTERFACE:${ldpk_INCLUDE_DIR}>
   PUBLIC $<INSTALL_INTERFACE:include/>
   )
-
-# Install public headers
-include(GNUInstallDirs)
-install(DIRECTORY
-  "${mmcolorio_include_dir}/"
-  "${mmcore_include_dir}/"
-  "${mmimage_include_dir}/"
-  "${mmlens_include_dir}/"
-  "${mmscenegraph_include_dir}/"
-  "${main_include_dir}/"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-  FILES_MATCHING PATTERN "*.h")
-
-mm_common_install_target_library("mmsolverlibs_cpp" ${cpp_lib_name})
-

lib/thirdparty/ceres/CMakeLists.txt

@@ -247,19 +247,3 @@ target_link_libraries(ceres PUBLIC
 
 # Create an alias to match the expected target name from FindCeres
 add_library(ceres::ceres ALIAS ceres)
-
-# Install headers (public API)
-install(DIRECTORY include/ceres
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.h"
-)
-
-# Install the static config.h (required by internal headers)
-install(FILES ${CERES_CONFIG_OUTPUT_DIR}/ceres/internal/config.h
-  DESTINATION include/ceres/internal
-)
-
-# Install the library as part of mmsolverlibs
-# Note: The following is only used when building as part of mmSolver
-include(MMCommonUtils)
-mm_common_install_target_library("mmsolverlibs_cpp" ceres)

lib/thirdparty/ceres/internal/ceres/CMakeLists.txt

@@ -253,12 +253,6 @@ else (BUILD_SHARED_LIBS)
   target_link_libraries(ceres ${CERES_LIBRARY_DEPENDENCIES})
 endif (BUILD_SHARED_LIBS)
 
-install(TARGETS ceres
-        EXPORT  CeresExport
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib${LIB_SUFFIX}
-        ARCHIVE DESTINATION lib${LIB_SUFFIX})
-
 if (BUILD_TESTING AND GFLAGS)
   add_library(gtest gmock_gtest_all.cc gmock_main.cc)
   if (BUILD_SHARED_LIBS)

lib/thirdparty/cminpack/CMakeLists.txt

@@ -96,14 +96,3 @@ endif()
 
 # Create an alias to match the expected target name
 add_library(cminpack::cminpack ALIAS cminpack_s)
-
-# Install headers
-install(FILES
-  cminpack.h
-  minpack.h
-  DESTINATION include/cminpack-1
-)
-
-# Install the library as part of mmsolverlibs
-include(MMCommonUtils)
-mm_common_install_target_library("mmsolverlibs_cpp" cminpack_s)

lib/thirdparty/eigen/CMakeLists.txt

@@ -83,17 +83,3 @@ if(TARGET Eigen3)
     )
   endif()
 endif()
-
-# Install Eigen headers - now properly organized in Eigen subdirectory
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Eigen/
-        DESTINATION include/Eigen
-        FILES_MATCHING PATTERN "*" PATTERN "*.h" PATTERN "*.hpp")
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unsupported
-        DESTINATION include
-        FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
-
-# Install Eigen targets
-include(MMCommonUtils)
-mm_common_install_target_library("mmsolverlibs_cpp" eigen)
-# Note: Eigen3 target is exported early in the main CMakeLists.txt to resolve dependency ordering

lib/thirdparty/glog/CMakeLists.txt

@@ -154,20 +154,5 @@ set_target_properties(glog PROPERTIES
   OUTPUT_NAME glog
 )
 
-# Install the library and headers for integration with the main build
-install(TARGETS glog
-  EXPORT mmsolverlibs_cppTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
-)
-
-# Install headers
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/glog
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.h"
-)
-
 message(STATUS "glog: Version ${GLOG_VERSION} (vendored)")