robinmap

Signed-off-by: Larry Gritz <[email protected]>
lgritz · Nov 16, 2024 · a5997b7 · a5997b7
1 parent aedeff3
commit a5997b7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 76 deletions.
diff --git a/src/cmake/build_Robinmap.cmake b/src/cmake/build_Robinmap.cmake
diff --git a/src/cmake/dependencies/build_Imath.cmake b/src/cmake/dependencies/build_Imath.cmake
@@ -10,7 +10,6 @@ set_cache (Imath_GIT_TAG "v${Imath_BUILD_VERSION}" "Git tag to checkout")
 set_if_not (LOCAL_BUILD_SHARED_LIBS_DEFAULT OFF)
 set_cache (Imath_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}
            DOC "Should a local Imath build, if necessary, build shared libraries" ADVANCED)
-# string (MAKE_C_IDENTIFIER ${Imath_BUILD_VERSION} Imath_VERSION_IDENT)
 
 
 ExternalProject_Add(Imath
@@ -30,38 +29,3 @@ ExternalProject_Add(Imath
         -D IMATH_INSTALL_PKG_CONFIG=OFF
         -D IMATH_INSTALL_TOOLS=OFF
     )
-
-
-# string (MAKE_C_IDENTIFIER ${Imath_BUILD_VERSION} Imath_VERSION_IDENT)
-# 
-# build_dependency_with_cmake(Imath
-#     VERSION         ${Imath_BUILD_VERSION}
-#     GIT_REPOSITORY  ${Imath_GIT_REPOSITORY}
-#     GIT_TAG         ${Imath_GIT_TAG}
-#     CMAKE_ARGS
-#         -D BUILD_SHARED_LIBS=${Imath_BUILD_SHARED_LIBS}
-#         # Don't built unnecessary parts of Imath
-#         -D BUILD_TESTING=OFF
-#         -D IMATH_BUILD_EXAMPLES=OFF
-#         -D IMATH_BUILD_PYTHON=OFF
-#         -D IMATH_BUILD_TESTING=OFF
-#         -D IMATH_BUILD_TOOLS=OFF
-#         -D IMATH_INSTALL_DOCS=OFF
-#         -D IMATH_INSTALL_PKG_CONFIG=OFF
-#         -D IMATH_INSTALL_TOOLS=OFF
-#         # Give the library a custom name and symbol namespace so it can't
-#         # conflict with any others in the system or linked into the same app.
-#         # not needed -D IMATH_NAMESPACE_CUSTOM=1
-#         # not needed -D IMATH_INTERNAL_NAMESPACE=${PROJ_NAMESPACE_V}_Imath_${Imath_VERSION_IDENT}
-#         -D IMATH_LIB_SUFFIX=_v${Imath_VERSION_IDENT}_${PROJ_NAMESPACE_V}
-#     )
-# 
-# 
-# # Signal to caller that we need to find again at the installed location
-# set (Imath_REFIND TRUE)
-# set (Imath_REFIND_ARGS CONFIG)
-# set (Imath_REFIND_VERSION ${Imath_BUILD_VERSION})
-# 
-# if (Imath_BUILD_SHARED_LIBS)
-#     install_local_dependency_libs (Imath Imath)
-# endif ()
diff --git a/src/cmake/dependencies/build_OpenEXR.cmake b/src/cmake/dependencies/build_OpenEXR.cmake
@@ -10,14 +10,12 @@ set_cache (OpenEXR_GIT_TAG "v${OpenEXR_BUILD_VERSION}" "Git tag to checkout")
 set_if_not (LOCAL_BUILD_SHARED_LIBS_DEFAULT OFF)
 set_cache (OpenEXR_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}
            DOC "Should a local OpenEXR build, if necessary, build shared libraries" ADVANCED)
-# string (MAKE_C_IDENTIFIER ${OpenEXR_BUILD_VERSION} OpenEXR_VERSION_IDENT)
 
 
 ExternalProject_Add(OpenEXR
     PREFIX          ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR
     GIT_REPOSITORY  ${OpenEXR_GIT_REPOSITORY}
     GIT_TAG         ${OpenEXR_GIT_TAG}
-    # DEPENDS         Imath
     CMAKE_ARGS
         -D BUILD_SHARED_LIBS=${Imath_BUILD_SHARED_LIBS}
         -D OPENEXR_FORCE_INTERNAL_DEFLATE=ON
@@ -44,15 +42,3 @@ ExternalProject_Add(OpenEXR
         # -D Iex_INTERNAL_NAMESPACE=${PROJ_NAMESPACE_V}_Iex_${OpenEXR_VERSION_IDENT}
         # -D OPENEXR_LIB_SUFFIX=_v${OpenEXR_VERSION_IDENT}_${PROJ_NAMESPACE_V}
     )
-
-
-# # Signal to caller that we need to find again at the installed location
-# set (OpenEXR_REFIND TRUE)
-# set (OpenEXR_REFIND_ARGS CONFIG)
-# set (OpenEXR_REFIND_VERSION ${OpenEXR_BUILD_VERSION})
-# 
-# if (OpenEXR_BUILD_SHARED_LIBS)
-#     install_local_dependency_libs (OpenEXR OpenEXR)
-#     install_local_dependency_libs (OpenEXR IlmThread)
-#     install_local_dependency_libs (OpenEXR Iex)
-# endif ()
diff --git a/src/cmake/dependencies/build_Robinmap.cmake b/src/cmake/dependencies/build_Robinmap.cmake
@@ -0,0 +1,26 @@
+# Copyright Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: Apache-2.0
+# https://github.com/AcademySoftwareFoundation/OpenImageIO
+
+######################################################################
+# Robinmap by hand!
+######################################################################
+
+set_cache (Robinmap_BUILD_VERSION 1.3.0 "Robinmap version for local builds")
+set_cache (Robinmap_GIT_REPOSITORY "https://github.com/Tessil/robin-map" "Repo URL")
+set_cache (Robinmap_GIT_TAG "v${Robinmap_BUILD_VERSION}" "Git tag to checkout")
+
+ExternalProject_Add(Robinmap
+    # VERSION         ${Robinmap_BUILD_VERSION}
+    PREFIX          ${CMAKE_CURRENT_BINARY_DIR}/Robinmap
+    GIT_REPOSITORY  ${Robinmap_GIT_REPOSITORY}
+    GIT_TAG         ${Robinmap_GIT_TAG}
+    # CMAKE_ARGS
+    )
+
+# # Set some things up that we'll need for a subsequent find_package to work
+# set (Robinmap_ROOT ${Robinmap_INSTALL_DIR})
+# 
+# # Signal to caller that we need to find again at the installed location
+# set (Robinmap_REFIND TRUE)
+# set (Robinmap_VERSION ${Robinmap_BUILD_VERSION})
diff --git a/src/cmake/dependencies/build_ZLIB.cmake b/src/cmake/dependencies/build_ZLIB.cmake
@@ -14,7 +14,6 @@ set_if_not (LOCAL_BUILD_SHARED_LIBS_DEFAULT OFF)
 set_cache (ZLIB_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}
            DOC "Should execute a local ZLIB build, if necessary, build shared libraries" ADVANCED)
 
-# string (MAKE_C_IDENTIFIER ${ZLIB_BUILD_VERSION} ZLIB_VERSION_IDENT)
 
 ExternalProject_Add(ZLIB
     PREFIX          ${CMAKE_CURRENT_BINARY_DIR}/ZLIB