Skip to content

Commit d5f840b

Browse files
committed
WIP-FLASH: working on submodules deps of o3d
1 parent 1887869 commit d5f840b

File tree

4 files changed

+32
-13
lines changed

4 files changed

+32
-13
lines changed

.gitmodules

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@
1010
url = https://gitlab.com/libeigen/eigen.git
1111
[submodule "deps/fmt"]
1212
path = deps/fmt
13-
url = https://github.com/fmtlib/fmt.git
13+
url = https://github.com/fmtlib/fmt.git
14+
[submodule "deps/glew"]
15+
path = deps/glew
16+
url = https://github.com/diffCheckOrg/submodule-glew.git
17+
[submodule "deps/glfw"]
18+
path = deps/glfw
19+
url = https://github.com/glfw/glfw.git

CMakeLists.txt

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,36 @@ target_precompile_headers(${SHARED_LIB_NAME} PUBLIC src/diffcheckpch.hh)
4040
# 3rd party
4141
#--------------------------------------------------------------------------
4242

43+
# 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])
44+
# glfw --------------------------------------------------------------
45+
add_subdirectory(deps/glfw)
46+
target_link_libraries(${SHARED_LIB_NAME} PUBLIC glfw ${GLFW_LIBRARIES})
47+
target_include_directories(${SHARED_LIB_NAME} PUBLIC ${GLFW_INCLUDE_DIRS})
48+
target_link_libraries(${SHARED_LIB_NAME} INTERFACE glfw ${GLFW_LIBRARIES})
49+
target_include_directories(${SHARED_LIB_NAME} INTERFACE ${GLFW_INCLUDE_DIRS})
50+
51+
# TODO: replace with add_subdirectory() instead of binaries
4352
# glew --------------------------------------------------------------
53+
set(GLEW_VERSION 2_2_0) # 2.2.0
54+
set(GLEW_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/bin/Release/x64/glew32)
55+
set(GLEW_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/glew/win/${GLEW_VERSION}/include)
4456

45-
46-
47-
57+
target_link_libraries(${SHARED_LIB_NAME} PUBLIC ${GLEW_LIB_PATH})
58+
target_link_libraries(${SHARED_LIB_NAME} INTERFACE ${GLEW_LIB_PATH})
59+
target_include_directories(${SHARED_LIB_NAME} PUBLIC ${GLEW_INCLUDE_PATH})
60+
target_include_directories(${SHARED_LIB_NAME} INTERFACE ${GLEW_INCLUDE_PATH})
4861

4962
# fmt --------------------------------------------------------------
50-
set(FMT_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/fmt/lib)
51-
set(FMT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/fmt/include)
63+
add_subdirectory(deps/fmt)
5264

53-
target_link_libraries(${SHARED_LIB_NAME} PUBLIC ${FMT_LIB_PATH})
54-
target_link_libraries(${SHARED_LIB_NAME} INTERFACE ${FMT_LIB_PATH})
55-
target_include_directories(${SHARED_LIB_NAME} PUBLIC ${FMT_INCLUDE_PATH})
56-
target_include_directories(${SHARED_LIB_NAME} INTERFACE ${FMT_INCLUDE_PATH})
65+
target_link_libraries(${SHARED_LIB_NAME} PUBLIC fmt::fmt)
66+
target_link_libraries(${SHARED_LIB_NAME} INTERFACE fmt::fmt)
5767

5868
# Eigen --------------------------------------------------------------
59-
set(EIGEN_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/eigen)
60-
target_include_directories(${SHARED_LIB_NAME} PUBLIC ${EIGEN_INCLUDE_PATH})
61-
target_include_directories(${SHARED_LIB_NAME} INTERFACE ${EIGEN_INCLUDE_PATH})
69+
add_subdirectory(deps/eigen)
70+
71+
target_link_libraries(${SHARED_LIB_NAME} PUBLIC Eigen3::Eigen)
72+
target_link_libraries(${SHARED_LIB_NAME} INTERFACE Eigen3::Eigen)
6273

6374
# Open3D --------------------------------------------------------------
6475
set(O3D_VERSION 0_17) # 0.17.0

deps/glew

Submodule glew added at 29075c7

deps/glfw

Submodule glfw added at bf945f1

0 commit comments

Comments
 (0)