Merge remote-tracking branch 'adnanmunawar/ambf-2.0' into ambf-2.0

TzeLun · Jan 7, 2022 · 10ee1f1 · 10ee1f1
2 parents d7d4531 + dfb6dc4
commit 10ee1f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/AMBFConfig.cmake.in b/AMBFConfig.cmake.in
@@ -49,4 +49,5 @@ if(NOT TARGET AMBF AND NOT AMBF_BINARY_DIR)
 endif()
 
 # IMPORTED target created by AMBFTargets.cmake
+set(AMBF_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
 set(AMBF_LIBRARIES "@CONF_LIBRARIES@")
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -416,11 +416,12 @@ endif()
 #
 
 # export package for use from the build tree
-export (TARGETS ambf_framework ${ADF_LOADER_LIBRARIES} bullet chai3d FILE ${PROJECT_BINARY_DIR}/AMBFTargets.cmake)
+export (TARGETS ambf_framework ${ADF_LOADER_LIBRARIES} bullet chai3d glfw FILE ${PROJECT_BINARY_DIR}/AMBFTargets.cmake)
 export (PACKAGE AMBF)
 
 # configure package
 set (CONF_INCLUDE_DIRS ${AMBF_INCLUDE_DIRS})
+set (CONF_LIBRARY_DIRS  ${AMBF_LIBRARY_DIRS})
 set (CONF_LIBRARIES  ${AMBF_LIBRARIES})
 set (CONF_DEFINITIONS  ${AMBF_DEFINITIONS} ${CHAI3D_DEFINITIONS} ${BULLET_DEFINITIONS} ${COMMON_DEFINITIONS})