WIP-CAP: working prebinaries linking for open3d 0_17, needs cleaneaning

Author: 9and3

CMakeLists.txt

@@ -4,8 +4,23 @@ set(CMAKE_CXX_STANDARD 17)
 
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+
+#--------------------------------------------------------------------------
+# refresh deps gitmodules
+#--------------------------------------------------------------------------
+
 include(external_tools)
 
+execute_process(COMMAND git submodule update --init --recursive
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    RESULT_VARIABLE GIT_SUBMOD_RESULT
+    )
+if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+    message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+endif()
+
+
 #--------------------------------------------------------------------------
 # library
 #--------------------------------------------------------------------------
@@ -40,48 +55,117 @@ target_precompile_headers(${SHARED_LIB_NAME} PUBLIC src/diffcheckpch.hh)
 # 3rd party
 #--------------------------------------------------------------------------
 
+
+
+
+
 # FIXME: problems with glfw (LINK : fatal error LNK1104: cannot open file '..\deps\glew\win\2_2_0\bin\Release\x64\glew32.obj' [F:\diffCheck\build\diffCheck.vcxproj])
-# glfw --------------------------------------------------------------
-add_subdirectory(deps/glfw)
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC glfw ${GLFW_LIBRARIES})
-target_include_directories(${SHARED_LIB_NAME} PUBLIC ${GLFW_INCLUDE_DIRS})
-target_link_libraries(${SHARED_LIB_NAME} INTERFACE glfw ${GLFW_LIBRARIES})
-target_include_directories(${SHARED_LIB_NAME} INTERFACE ${GLFW_INCLUDE_DIRS})
+# glfw (pre-build binaries) --------------------------------------------------------------
+
+# TODO: add binaries to deps
+set(GLFW_VERSION 3_3_4)  # 3.3.4
+set(GLFW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glfw/win/${GLFW_VERSION}/lib-vc2019)
+set(GLFW_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glfw/win/${GLFW_VERSION}/include)
+
+add_library(glfw3 SHARED IMPORTED)
+set_target_properties(glfw3 PROPERTIES
+    IMPORTED_LOCATION ${GLFW_LIB_PATH}/glfw3.dll
+    IMPORTED_IMPLIB ${GLFW_LIB_PATH}/glfw3.lib
+    INTERFACE_INCLUDE_DIRECTORIES ${GLFW_INCLUDE_PATH}
+    )
+
+# target_link_directories(${SHARED_LIB_NAME} PUBLIC ${GLFW_LIB_PATH})
+# target_link_directories(${SHARED_LIB_NAME} INTERFACE ${GLFW_LIB_PATH})
+
+target_link_libraries(${SHARED_LIB_NAME} PUBLIC glfw3)
+target_link_libraries(${SHARED_LIB_NAME} INTERFACE glfw3)
+target_include_directories(${SHARED_LIB_NAME} PUBLIC ${GLFW_INCLUDE_PATH})
+target_include_directories(${SHARED_LIB_NAME} INTERFACE ${GLFW_INCLUDE_PATH})
+
+# #find openGL
+# find_package(OpenGL REQUIRED)
+# target_link_libraries(${SHARED_LIB_NAME} PUBLIC OpenGL::GL)
+# target_link_libraries(${SHARED_LIB_NAME} INTERFACE OpenGL::GL)
+
 
 # TODO: replace with add_subdirectory() instead of binaries
-# glew --------------------------------------------------------------
+# glew (pre-build binaries) --------------------------------------------------------------
 set(GLEW_VERSION 2_2_0)  # 2.2.0
-set(GLEW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/bin/Release/x64/glew32)
+set(GLEW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/bin/Release/x64)
+set(GLEW_STATIC_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/lib/Release/x64)
 set(GLEW_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/include)
 
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC ${GLEW_LIB_PATH})
-target_link_libraries(${SHARED_LIB_NAME} INTERFACE ${GLEW_LIB_PATH})
+add_library(glew32 SHARED IMPORTED)
+set_target_properties(glew32 PROPERTIES
+    IMPORTED_LOCATION ${GLEW_LIB_PATH}/glew32.dll
+    IMPORTED_IMPLIB ${GLEW_STATIC_LIB_PATH}/glew32.lib
+    INTERFACE_INCLUDE_DIRECTORIES ${GLEW_INCLUDE_PATH}
+    )
+
+
+# target_link_directories(${SHARED_LIB_NAME} PUBLIC ${GLEW_STATIC_LIB_PATH})
+# target_link_directories(${SHARED_LIB_NAME} INTERFACE ${GLEW_STATIC_LIB_PATH})
+# target_link_directories(${SHARED_LIB_NAME} PUBLIC ${GLEW_LIB_PATH})
+# target_link_directories(${SHARED_LIB_NAME} INTERFACE ${GLEW_LIB_PATH})
+
+target_link_libraries(${SHARED_LIB_NAME} PUBLIC glew32)
+target_link_libraries(${SHARED_LIB_NAME} INTERFACE glew32)
 target_include_directories(${SHARED_LIB_NAME} PUBLIC ${GLEW_INCLUDE_PATH})
 target_include_directories(${SHARED_LIB_NAME} INTERFACE ${GLEW_INCLUDE_PATH})
 
-# fmt --------------------------------------------------------------
+# fmt (header-only)--------------------------------------------------------------
 add_subdirectory(deps/fmt)
 
 target_link_libraries(${SHARED_LIB_NAME} PUBLIC fmt::fmt)
 target_link_libraries(${SHARED_LIB_NAME} INTERFACE fmt::fmt)
 
-# Eigen --------------------------------------------------------------
+# Eigen (header-only)--------------------------------------------------------------
 add_subdirectory(deps/eigen)
 
 target_link_libraries(${SHARED_LIB_NAME} PUBLIC Eigen3::Eigen)
 target_link_libraries(${SHARED_LIB_NAME} INTERFACE Eigen3::Eigen)
 
-# Open3D --------------------------------------------------------------
+# Open3D (pre-build binaries)--------------------------------------------------------------
 set(O3D_VERSION 0_17)  # 0.17.0
-set(OPEN3D_SHAREDLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/bin/Open3D)
+set(OPEN3D_SHAREDLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/bin)
+set(OPEN3D_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/lib)
 set(OPEN3D_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/include)
 
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC ${OPEN3D_SHAREDLIB_PATH})
-target_link_libraries(${SHARED_LIB_NAME} INTERFACE ${OPEN3D_SHAREDLIB_PATH})
+add_library(Open3D SHARED IMPORTED)
+set_target_properties(Open3D PROPERTIES
+    IMPORTED_LOCATION ${OPEN3D_SHAREDLIB_PATH}/Open3D.dll
+    IMPORTED_IMPLIB ${OPEN3D_LIB_PATH}/Open3D.lib
+    INTERFACE_INCLUDE_DIRECTORIES ${OPEN3D_INCLUDE_PATH}
+    )
+
+# target_link_directories(${SHARED_LIB_NAME} PUBLIC ${OPEN3D_LIB_PATH})
+# target_link_directories(${SHARED_LIB_NAME} INTERFACE ${OPEN3D_LIB_PATH})
+# # target_link_directories(${SHARED_LIB_NAME} PUBLIC ${OPEN3D_SHAREDLIB_PATH})
+# # target_link_directories(${SHARED_LIB_NAME} INTERFACE ${OPEN3D_SHAREDLIB_PATH})
+
+target_link_libraries(${SHARED_LIB_NAME} PUBLIC Open3D)
+target_link_libraries(${SHARED_LIB_NAME} INTERFACE Open3D)
 target_include_directories(${SHARED_LIB_NAME} PUBLIC ${OPEN3D_INCLUDE_PATH})
 target_include_directories(${SHARED_LIB_NAME} INTERFACE ${OPEN3D_INCLUDE_PATH})
 
 
+
+
+# copy all the dlls to the bin directory
+# List of libraries that DiffCheck is linked against
+set(DEPENDENCIES glfw3 glew32 Open3D)
+
+foreach(DEP_LIB ${DEPENDENCIES})
+    add_custom_command(TARGET ${SHARED_LIB_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        $<TARGET_FILE:${DEP_LIB}>
+        $<TARGET_FILE_DIR:${SHARED_LIB_NAME}>
+    )
+endforeach()
+
+
+
+
 #--------------------------------------------------------------------------
 # executable
 #--------------------------------------------------------------------------
@@ -100,6 +184,7 @@ target_include_directories(${APP_NAME_EXE}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
+
 #--------------------------------------------------------------------------
 # Tests
 #--------------------------------------------------------------------------

deps/glfw/win/3_3_4/LICENSE.md

@@ -0,0 +1,23 @@
+Copyright (c) 2002-2006 Marcus Geelnard
+
+Copyright (c) 2006-2019 Camilla Löwy
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+

deps/glfw/win/3_3_4/README.md

@@ -0,0 +1,70 @@
+# GLFW binaries for 64-bit Windows
+
+This archive contains documentation, headers, pre-compiled static libraries,
+import libraries and DLLs for GLFW 3.4.
+
+Binaries for the following compilers are included
+
+ - Visual C++ 2022 (built with 17.9.0)
+ - Visual C++ 2019 (built with 16.11.34)
+ - Visual C++ 2017 (built with 15.9.60)
+ - Visual C++ 2015 (built with 14.0.25431.01)
+ - Visual C++ 2013 (built with 12.0.40629.00)
+ - MinGW-w64 (built with 13.2.0-win32-dwarf-msvcrt)
+
+
+## Binaries for Visual C++
+
+All binaries for Visual C++ 2017 and earlier are compatible with Windows XP, but
+this is not supported by Visual C++ 2019.  This support has been deprecated by
+Microsoft and GLFW will also drop support for Windows XP in a future release.
+
+### GLFW as a DLL
+
+To use GLFW as a DLL, link against the `glfw3dll.lib` file for your
+environment.  This will add a load time dependency on `glfw3.dll`.  The
+remaining files in the same directory are not needed.
+
+This DLL is built in release mode for the Multithreaded DLL runtime library.
+
+There is also a GLFW DLL and import library pair in the `lib-static-ucrt`
+directory.  These are built with Visual C++ 2019 and the static Multithreaded
+runtime library.
+
+### GLFW as a static library
+
+To use GLFW as a static library, link against `glfw3.lib` if your application
+is using the Multithreaded DLL runtime library, or `glfw3_mt.lib` if it is
+using the static Multithreaded runtime library.  The remaining files in the same
+directory are not needed.
+
+The static libraries are built in release mode and do not contain debug
+information but can still be linked with the debug versions of the runtime
+library.
+
+
+## Binaries for MinGW-w64
+
+### GLFW as a DLL
+
+To use GLFW as a DLL, link against the `libglfw3dll.a` file for your
+environment.  This will add a load time dependency on `glfw3.dll`.  The
+remaining files in the same directory are not needed.
+
+The DLLs are built in release mode.
+
+The DLLs depend on the `msvcrt.dll` C runtime library.  There is also a GLFW
+DLL and import library in the `lib-static-ucrt` directory that is built with
+Visual C++ 2019 and statically linked against the UCRT.
+
+All DLLs in this archive provide the same ABI and can be used as drop-in
+replacements for one another, as long as the C runtime library they depend on is
+available.
+
+### GLFW as a static library
+
+To use GLFW as a static library, link against the `libglfw3.a` file for your
+environment.  The other files in the same directory are not needed.
+
+The library is built in release mode and do not contain debug information.
+