Configuration - Implement VCPKG manifest basis

adm/cmake/draco.cmake

@@ -1,6 +1,51 @@
 # Draco - a library for a lossy vertex data compression, used as extension to glTF format.
 # https://github.com/google/draco
 
+macro (SEARCH_DRACO_LIB)
+  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+    if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+      set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
+
+      find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
+                                           PATHS "${3RDPARTY_DRACO_DIR}"
+                                           PATH_SUFFIXES lib
+                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                           NO_DEFAULT_PATH)
+      if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
+        set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
+      endif()
+    endif()
+
+    if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+      set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+
+      find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
+                                           PATHS "${3RDPARTY_DRACO_DIR}"
+                                           PATH_SUFFIXES libd debug/lib
+                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                           NO_DEFAULT_PATH)
+      if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
+        get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
+        set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
+      endif()
+    endif()
+  endif()
+endmacro()
+
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package (draco CONFIG REQUIRED)
+
+  set (3RDPARTY_DRACO_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+  SEARCH_DRACO_LIB()
+
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/draco")
+  return()
+endif()
+
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 if (NOT DEFINED 3RDPARTY_DRACO_DIR)
@@ -59,35 +104,3 @@ if (3RDPARTY_DRACO_INCLUDE_DIR AND EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
 else()
   list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
 endif()
-
-if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
-
-    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES lib
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
-    endif()
-  endif()
-
-  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
-
-    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES libd
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-    endif()
-  endif()
-endif()

adm/cmake/ffmpeg.cmake

@@ -1,4 +1,17 @@
-# FFmpeg
+# 
+
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(FFMPEG REQUIRED)
+  set(CSF_FFmpeg ${FFMPEG_LIBRARIES})
+  if (WIN32)
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS}")
+  return()
+endif()
 
 if (NOT DEFINED INSTALL_FFMPEG)
   set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")

adm/cmake/freeimage.cmake

@@ -1,3 +1,16 @@
 #freeimage
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+find_package(freeimage CONFIG REQUIRED)
+  set(CSF_FreeImagePlus freeimage::FreeImagePlus)
+  if (WIN32)
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREEIMAGE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/")
+  return()
+endif()
+
 THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "CSF_FreeImagePlus" "d")

adm/cmake/freetype.cmake

@@ -1,5 +1,18 @@
 # freetype
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package (Freetype MODULE REQUIRED)
+  set (CSF_FREETYPE Freetype::Freetype)
+  if (WIN32)
+    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_FREETYPE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
   set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
 endif()

adm/cmake/jemalloc.cmake

@@ -85,6 +85,16 @@ endmacro()
 # Reset CSF variable
 set (CSF_MMGR "")
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  set (3RDPARTY_JEMALLOC_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+  OCCT_CHECK_AND_UNSET_GROUP (3RDPARTY_JEMALLOC_LIBRARY_SHARED)
+  OCCT_CHECK_AND_UNSET_GROUP (3RDPARTY_JEMALLOC_LIBRARY_STATIC)
+  SEARCH_JEMALLOC()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/jemalloc")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_JEMALLOC)
   set (INSTALL_JEMALLOC OFF CACHE BOOL "${INSTALL_INSTALL_JEMALLOC_DESCR}")
 endif()

adm/cmake/occt_defs_flags.cmake

@@ -163,7 +163,7 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPIL
     if (APPLE)
       set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
     elseif(NOT WIN32)
-      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm -Wl,-Bsymbolic ${CMAKE_SHARED_LINKER_FLAGS}")
     endif()
   endif()
 endif()

adm/cmake/occt_macros.cmake

@@ -55,7 +55,11 @@ endfunction()
 
 # COMPILER_BITNESS variable
 macro (OCCT_MAKE_COMPILER_BITNESS)
-  math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
+  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(COMPILER_BITNESS 64)
+  else()
+    set(COMPILER_BITNESS 32)
+  endif()
 endmacro()
 
 # OS_WITH_BIT
@@ -690,3 +694,15 @@ macro (OCCT_CREATE_SYMLINK_TO_FILE LIBRARY_NAME LINK_NAME)
     ")
   endif()
 endmacro()
+
+macro(OCCT_ADD_VCPKG_FEATURE THE_FEATURE)
+  if (BUILD_USE_VCPKG)
+    list(APPEND VCPKG_MANIFEST_FEATURES "${THE_FEATURE}" PARENT_SCOPE)
+  endif()
+endmacro()
+
+macro (OCCT_UNSET_VCPKG_FEATURE THE_FEATURE)
+  if (BUILD_USE_VCPKG)
+    list (REMOVE_ITEM VCPKG_MANIFEST_FEATURES "${THE_FEATURE}" PARENT_SCOPE)
+  endif()
+endmacro()

adm/cmake/openvr.cmake

@@ -2,4 +2,17 @@
 # OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
 # https://github.com/ValveSoftware/openvr
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  set (USED_3RDPARTY_OPENVR_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+  find_library (FIND_OPENVR_LIB NAMES "${CSF_OpenVR}"
+                PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib"
+                CMAKE_FIND_ROOT_PATH_BOTH
+                NO_DEFAULT_PATH)
+  set (CSF_OpenVR "${FIND_OPENVR_LIB}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/")
+  return()
+endif()
+
 THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")

adm/cmake/rapidjson.cmake

@@ -1,5 +1,13 @@
 # RapidJSON
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(RapidJSON CONFIG REQUIRED)
+  set(CSF_RapidJSON rapidjson)
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/rapidjson")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_RAPIDJSON)
   set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
 endif()

adm/cmake/tbb.cmake

@@ -1,5 +1,18 @@
 # tbb
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(TBB CONFIG REQUIRED)
+  set(CSF_TBB TBB::tbb TBB::tbbmalloc)
+  if (WIN32)
+    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_TBB_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tbb")
+  return()
+endif()
+
 if (MSVC AND BUILD_SHARED_LIBS)
   add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
   add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)

adm/cmake/tcl.cmake

@@ -1,6 +1,6 @@
 # tcl
 
-if (NOT DEFINED INSTALL_TCL)
+if (NOT DEFINED INSTALL_TCL AND NOT BUILD_USE_VCPKG)
   set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
 endif()
 
@@ -14,6 +14,10 @@ if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
   set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
 endif()
 
+if (BUILD_USE_VCPKG)
+  set (3RDPARTY_TCL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcl" FORCE)
+  set (3RDPARTY_TCL_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tcl" FORCE)
+endif()
 
 # tcl library file (with absolute path)
 if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)

adm/cmake/tk.cmake

@@ -1,12 +1,12 @@
 # tk
 
-if (NOT DEFINED INSTALL_TK AND BUILD_SHARED_LIBS)
+if (NOT DEFINED INSTALL_TK AND NOT BUILD_USE_VCPKG)
   set (INSTALL_TK OFF CACHE BOOL "${INSTALL_TK_DESCR}")
 endif()
 
 # tk directory
 if (NOT DEFINED 3RDPARTY_TK_DIR)
-  set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
+    set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
 endif ()
 
 if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_TCLTK_DIR)
@@ -18,6 +18,12 @@ if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
   set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
 endif()
 
+if (BUILD_USE_VCPKG)
+  set (3RDPARTY_TK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tk" FORCE)
+  set (3RDPARTY_TCLTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" CACHE PATH "The directory containing tcltk" FORCE)
+  set (3RDPARTY_TK_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE FILEPATH "The directory containing headers of tk" FORCE)
+endif()
+
 if (BUILD_SHARED_LIBS)
   # tk library file (with absolute path)
   if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)

adm/cmake/vtk.cmake

@@ -1,5 +1,19 @@
 # vtk
 
+# vcpkg processing
+if (BUILD_USE_VCPKG)
+  find_package(VTK REQUIRED)
+  set(CSF_VTK VTK::CommonCore)
+  set(IS_VTK_9XX 1)
+  if (WIN32)
+    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
+  else()
+    set (USED_3RDPARTY_VTK_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+  endif()
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+  return()
+endif()
+
 if (NOT DEFINED INSTALL_VTK)
   set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
 endif()

adm/vcpkg/ports/tcl/force-shell-install.patch

@@ -0,0 +1,27 @@
+From 85842ba83b70d99f90ee3fff8c956e82d17759f2 Mon Sep 17 00:00:00 2001
+From: Marek Roszko <mark.roszko@gmail.com>
+Date: Tue, 18 Aug 2020 23:11:27 -0400
+Subject: [PATCH] Remove broken exist check for shell install
+
+---
+ win/makefile.vc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/win/makefile.vc b/win/makefile.vc
+index f5d2f4a..6bffe32 100644
+--- a/win/makefile.vc
++++ b/win/makefile.vc
+@@ -869,10 +869,8 @@ install-binaries:
+ 	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
+ !endif
+ 	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
+-!if exist($(TCLSH))
+ 	@echo Installing $(TCLSHNAME)
+ 	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
+-!endif
+ 	@echo Installing $(TCLSTUBLIBNAME)
+ 	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
+
+-- 
+2.28.0.windows.1
+