Go up on vr-imgui 2.0.1. Fix release build of FTGL

brown-ccv · Sep 9, 2022 · a3204f8 · a3204f8
1 parent 1172b62
commit a3204f8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt
@@ -315,10 +315,19 @@ execute_process(
 
 # Build external project
 execute_process(
-    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/FTGL
+    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/FTGL --config ${CMAKE_BUILD_TYPE}
 )
 #ENDIF()
 
+# find_package(OpenGL REQUIRED)
+FIND_PACKAGE(FTGL REQUIRED )
+if(FTGL_FOUND)
+  message(STATUS "FTGL found")
+  message(STATUS "FTGL_INCLUDE_DIR ${FTGL_INCLUDE_DIR}")
+ else()
+  message(STATUS "FTGL NOT found" )
+endif()
+
 #CCPFS
 # Configure external project
 #IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/CPPFSD/CPPFSD)

diff --git a/superbuild/FTGL/CMakeLists.txt b/superbuild/FTGL/CMakeLists.txt
@@ -4,7 +4,7 @@ include(ExternalProject)
 include(GNUInstallDirs)
 include(${CMAKE_SOURCE_DIR}/../macros.cmake)
 
-message("ZLIB INSTALL_DIR_ABSOLUTE ${INSTALL_DIR_ABSOLUTE}")
+message("FTGL INSTALL_DIR_ABSOLUTE ${INSTALL_DIR_ABSOLUTE}")
 message("FTGL CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")
 
 set(EXTERNAL_DIR_LOCATION ${CMAKE_BINARY_DIR})  
@@ -15,7 +15,7 @@ build_git_subproject(
    URL https://github.com/ulrichard/ftgl.git
    TAG master
    BUILD_ARGS
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DBUILD_SHARED_LIBS=OFF
 	-DFREETYPE_INCLUDE_DIR_ft2build=${CMAKE_INSTALL_PREFIX}/include/freetype2
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 )
diff --git a/superbuild/vr-imgui/CMakeLists.txt b/superbuild/vr-imgui/CMakeLists.txt
@@ -19,7 +19,7 @@ set(EXTERNAL_DIR_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/../install/)
 build_git_subproject(
   NAME vr-imgui 
   URL https://github.com/brown-ccv/VR-imgui.git
-  TAG v2.0.0
+  TAG v2.0.1
   BUILD_ARGS
    -DBUILD_WITH_VIRTUALKEYBOARD=OFF 
    -DBUILD_WITH_FILEBROWSER=ON