Skip to content

Commit e90b1b4

Browse files
Removing the installs for mmSolverLibs build component
These files were being "installed" as part of mmSolver - but they are not needed for installation, because the libraries are statically linked, and the include files are not needed for runtime in Maya.
1 parent b0b0aac commit e90b1b4

7 files changed

Lines changed: 1 addition & 102 deletions

File tree

lib/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,3 @@ if (MMSOLVERLIBS_BUILD_TESTS)
116116
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppbind/mmimage/tests)
117117
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppbind/mmscenegraph/tests)
118118
endif()
119-
120-
include(MMCommonUtils)
121-
mm_common_add_install_target("mmsolverlibs_cpp" ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in)

lib/mmsolverlibs/src/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,3 @@ target_include_directories(${cpp_lib_name}
147147
PRIVATE $<BUILD_INTERFACE:${ldpk_INCLUDE_DIR}>
148148
PUBLIC $<INSTALL_INTERFACE:include/>
149149
)
150-
151-
mm_common_install_target_library("mmsolverlibs_cpp" ${cpp_lib_name})
152-
153-
# Install public headers
154-
include(GNUInstallDirs)
155-
install(DIRECTORY
156-
"${mmcolorio_include_dir}/"
157-
"${mmcore_include_dir}/"
158-
"${mmimage_include_dir}/"
159-
"${mmlens_include_dir}/"
160-
"${mmscenegraph_include_dir}/"
161-
"${main_include_dir}/"
162-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
163-
FILES_MATCHING PATTERN "*.h")

lib/thirdparty/ceres/CMakeLists.txt

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ set(CERES_CONFIG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/config_static")
200200
set(CERES_CONFIG_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/config")
201201

202202
# Copy the static config.h to the build directory
203-
file(COPY "${CERES_CONFIG_SOURCE_DIR}/"
203+
file(COPY "${CERES_CONFIG_SOURCE_DIR}/"
204204
DESTINATION "${CERES_CONFIG_OUTPUT_DIR}")
205205

206206
# Configure include directories
@@ -245,34 +245,5 @@ target_link_libraries(ceres PUBLIC
245245
Eigen3::Eigen # Vendored Eigen for linear algebra
246246
)
247247

248-
# Threading support is intentionally disabled (CERES_NO_THREADS)
249-
# This simplifies the build and ensures Maya plugin compatibility
250-
251248
# Create an alias to match the expected target name from FindCeres
252249
add_library(ceres::ceres ALIAS ceres)
253-
254-
# Install headers (public API)
255-
install(DIRECTORY include/ceres
256-
DESTINATION include
257-
FILES_MATCHING PATTERN "*.h"
258-
)
259-
260-
# Install the static config.h (required by internal headers)
261-
install(FILES ${CERES_CONFIG_OUTPUT_DIR}/ceres/internal/config.h
262-
DESTINATION include/ceres/internal
263-
)
264-
265-
# Install the library as part of mmsolverlibs
266-
# Note: The following is only used when building as part of mmSolver
267-
if(COMMAND mm_common_install_target_library)
268-
include(MMCommonUtils)
269-
mm_common_install_target_library("mmsolverlibs_cpp" ceres)
270-
else()
271-
# Standalone installation
272-
install(TARGETS ceres
273-
EXPORT CeresTargets
274-
ARCHIVE DESTINATION lib
275-
LIBRARY DESTINATION lib
276-
RUNTIME DESTINATION bin
277-
)
278-
endif()

lib/thirdparty/cminpack/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,3 @@ endif()
9696

9797
# Create an alias to match the expected target name
9898
add_library(cminpack::cminpack ALIAS cminpack_s)
99-
100-
# Install headers
101-
install(FILES
102-
cminpack.h
103-
minpack.h
104-
DESTINATION include/cminpack-1
105-
)
106-
107-
# Install the library as part of mmsolverlibs
108-
include(MMCommonUtils)
109-
mm_common_install_target_library("mmsolverlibs_cpp" cminpack_s)

lib/thirdparty/eigen/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,6 @@ if(NOT eigen3_cxx_features OR eigen3_cxx_features STREQUAL "eigen3_cxx_features-
6767
target_compile_features(Eigen3 INTERFACE cxx_std_14)
6868
endif()
6969

70-
# Install Eigen headers - now properly organized in Eigen subdirectory
71-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Eigen/
72-
DESTINATION include/Eigen
73-
FILES_MATCHING PATTERN "*" PATTERN "*.h" PATTERN "*.hpp")
74-
75-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unsupported
76-
DESTINATION include
77-
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
78-
79-
# Install Eigen targets
80-
include(MMCommonUtils)
81-
mm_common_install_target_library("mmsolverlibs_cpp" eigen)
82-
# Note: Eigen3 target is exported early in the main CMakeLists.txt to resolve dependency ordering
83-
8470
# Set version information
8571
set_target_properties(eigen PROPERTIES
8672
VERSION "3.4.0"

lib/thirdparty/glog/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,4 @@ set_target_properties(glog PROPERTIES
154154
OUTPUT_NAME glog
155155
)
156156

157-
158-
# Install the library and headers for integration with the main build
159-
install(TARGETS glog
160-
EXPORT mmsolverlibs_cppTargets
161-
ARCHIVE DESTINATION lib
162-
LIBRARY DESTINATION lib
163-
RUNTIME DESTINATION bin
164-
INCLUDES DESTINATION include
165-
)
166-
167-
# Install headers
168-
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/glog
169-
DESTINATION include
170-
FILES_MATCHING PATTERN "*.h"
171-
)
172-
173157
message(STATUS "glog: Version ${GLOG_VERSION} (vendored)")

lib/thirdparty/openMVG/src/openMVG/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,3 @@ if(MSVC)
105105
set_target_properties(openMVG PROPERTIES COMPILE_FLAGS "/bigobj")
106106
target_compile_options(openMVG PUBLIC "-D_USE_MATH_DEFINES")
107107
endif()
108-
109-
# Install OpenMVG headers and template implementation files.
110-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../openMVG/
111-
DESTINATION include/openMVG
112-
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp" PATTERN "*.cpp")
113-
114-
# Install OpenMVG third_party dependencies.
115-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/
116-
DESTINATION include/third_party
117-
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp" PATTERN "*.cpp")
118-
119-
# Install OpenMVG as part of mmsolverlibs.
120-
include(MMCommonUtils)
121-
mm_common_install_target_library("mmsolverlibs_cpp" openMVG)

0 commit comments

Comments
 (0)