@@ -19,7 +19,6 @@ endif()
1919#--------------------------------------------------------------------------
2020# diffCheck dynamic lib
2121#--------------------------------------------------------------------------
22-
2322set (SHARED_LIB_NAME diffCheck)
2423
2524file (GLOB_RECURSE SOURCES_LIB
@@ -46,60 +45,24 @@ target_include_directories(${SHARED_LIB_NAME}
4645#--------------------------------------------------------------------------
4746# 3rd party
4847#--------------------------------------------------------------------------
49- # glfw (pre-build binaries) -----------------------------------------------
50- # TODO: add binaries to deps
51- # Get the latest commit on branch
52- download_submodule_project(glfw)
53- set (GLFW_VERSION 3_3_4) # 3.3.4
54- set (GLFW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/glfw/win/${GLFW_VERSION} /lib-vc2019)
55- set (GLFW_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/glfw/win/${GLFW_VERSION} /include )
56-
57- add_library (glfw3 SHARED IMPORTED )
58- set_target_properties (glfw3 PROPERTIES
59- IMPORTED_LOCATION ${GLFW_LIB_PATH} /glfw3.dll
60- IMPORTED_IMPLIB ${GLFW_LIB_PATH} /glfw3.lib
61- INTERFACE_INCLUDE_DIRECTORIES ${GLFW_INCLUDE_PATH}
62- )
63-
64- target_link_libraries (${SHARED_LIB_NAME} PUBLIC glfw3)
65- target_include_directories (${SHARED_LIB_NAME} PUBLIC ${GLFW_INCLUDE_PATH} )
66-
67- # TODO: replace with add_subdirectory() instead of binaries
68- # glew (pre-build binaries) ----------------------------------------------
69- download_submodule_project(glew)
70- set (GLEW_VERSION 2_2_0) # 2.2.0
71- set (GLEW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/glew/win/${GLEW_VERSION} /bin/Release/x64)
72- set (GLEW_STATIC_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/glew/win/${GLEW_VERSION} /lib/Release/x64)
73- set (GLEW_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/glew/win/${GLEW_VERSION} /include )
74-
75- add_library (glew32 SHARED IMPORTED )
76- set_target_properties (glew32 PROPERTIES
77- IMPORTED_LOCATION ${GLEW_LIB_PATH} /glew32.dll
78- IMPORTED_IMPLIB ${GLEW_STATIC_LIB_PATH} /glew32.lib
79- INTERFACE_INCLUDE_DIRECTORIES ${GLEW_INCLUDE_PATH}
80- )
81-
82- target_link_libraries (${SHARED_LIB_NAME} PUBLIC glew32)
83- target_include_directories (${SHARED_LIB_NAME} PUBLIC ${GLEW_INCLUDE_PATH} )
84-
85- # fmt (header-only)------------------------------------------------------
48+ # fmt (header-only)--------------------------------------------------------
8649download_submodule_project(fmt)
8750add_subdirectory (deps/fmt)
8851
8952target_link_libraries (${SHARED_LIB_NAME} PUBLIC fmt::fmt)
9053
91- # Eigen (header-only)----------------------------------------------------
54+ # Eigen (header-only)------------------------------------------------------
9255download_submodule_project(eigen)
9356add_subdirectory (deps/eigen)
9457
9558target_link_libraries (${SHARED_LIB_NAME} PUBLIC Eigen3::Eigen)
9659
97- # # # OpenGL (from system) ----------------------------------------------
60+ # OpenGL (from system) ------ ----------------------------------------------
9861find_package (OpenGL REQUIRED)
9962target_link_libraries (${SHARED_LIB_NAME} PUBLIC OpenGL::GL)
10063target_link_libraries (${SHARED_LIB_NAME} INTERFACE OpenGL::GL)
10164
102- # Libigl (header-only) ----- ---------------------------------------------
65+ # Libigl + glfw (header-only) ---------------------------------------------
10366download_submodule_project(libigl)
10467# all dependecies for libigl: https://libigl.github.io/third-party/
10568# set compiling flags for libigl
@@ -109,7 +72,7 @@ add_subdirectory(deps/libigl)
10972
11073target_link_libraries (${SHARED_LIB_NAME} PUBLIC igl::glfw)
11174
112- # Open3D (pre-build binaries /headless not visuals)-----------------------
75+ # Open3D (pre-build binaries /headless not visuals)------------------------
11376download_submodule_project(open3d)
11477set (O3D_VERSION 0_17) # 0.17.0
11578set (OPEN3D_SHAREDLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR} /deps/open3d/win/${O3D_VERSION} /bin)
@@ -126,10 +89,8 @@ set_target_properties(Open3D PROPERTIES
12689target_link_libraries (${SHARED_LIB_NAME} PUBLIC Open3D)
12790target_include_directories (${SHARED_LIB_NAME} PUBLIC ${OPEN3D_INCLUDE_PATH} )
12891
129- # ------------------------------------------------------------------------
130- # copy all the dlls to the bin directory to make dll accessible
131- # List of dynamic libraries that DiffCheck is linked against
132- set (DEPENDENCIES glfw3 glew32 Open3D)
92+ # copy the o3d dll to the binary dir to make it available for the app
93+ set (DEPENDENCIES Open3D)
13394
13495foreach (DEP_LIB ${DEPENDENCIES} )
13596 add_custom_command (TARGET ${SHARED_LIB_NAME} POST_BUILD
@@ -140,7 +101,7 @@ foreach(DEP_LIB ${DEPENDENCIES})
140101endforeach ()
141102
142103#--------------------------------------------------------------------------
143- # executable
104+ # executable for prototyping
144105#--------------------------------------------------------------------------
145106set (APP_NAME_EXE diffCheckApp)
146107
0 commit comments