Build JKQPLotter statically (8MB)

Author: jmarrec

CMakeLists.txt

@@ -659,19 +659,29 @@ if(UNIX)
   list(APPEND QT_INCLUDES ${Qt6XcbQpa_INCLUDE_DIRS})
 endif()
 
+####################### JKQTPlotter ######################
 # Make JKQTPlotter available after finding Qt
 include(FetchContent)
 
+# Build it statically
+set(OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF)
+
 set(JKQtPlotter_BUILD_EXAMPLES OFF)
+set(JKQtPlotter_BUILD_LIB_JKQTFASTPLOTTER OFF)
+
+# Force finding the same Qt
+find_package(QT NAMES Qt6 COMPONENTS Core Gui Widgets PrintSupport Svg Xml OpenGl REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
 
-FetchContent_Declare(JKQTPlotter
-                     GIT_REPOSITORY https://github.com/jkriege2/JKQtPlotter.git
-                     GIT_TAG        v4.0.3)
+FetchContent_Declare(JKQTPlotter${QT_VERSION_MAJOR}
+  GIT_REPOSITORY https://github.com/jkriege2/JKQtPlotter.git
+  # GIT_TAG        v5.0.0  # This is unreleased, but FetchContent support was added after v4.0.3
+)
 
-FetchContent_MakeAvailable(JKQTPlotter)
+FetchContent_MakeAvailable(JKQTPlotter${QT_VERSION_MAJOR})
+set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS})
 
-list(APPEND JKQT_LIBS JKQTCommonSharedLib)
-list(APPEND JKQT_LIBS JKQTPlotterSharedLib)
+##########################################################
 
 set(CMAKE_AUTOMOC OFF)
 

src/openstudio_app/CMakeLists.txt

@@ -188,7 +188,7 @@ if( APPLE )
 
 elseif( UNIX )
 
-  foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS} ${JKQT_LIBS})
+  foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS})
     get_property(LIB_LOCATION TARGET ${LIB} PROPERTY LOCATION)
     list(APPEND QT_LIB_LOCATIONS "${LIB_LOCATION}")
   endforeach()
@@ -275,14 +275,6 @@ elseif( WIN32 )
     #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_v8_context_snapshot} $<TARGET_FILE_DIR:${target_name}>/resources/
   )
 
-  add_custom_command(TARGET ${target_name}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:JKQTCommonSharedLib> $<TARGET_FILE_DIR:${target_name}>/
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:JKQTFastPlotterSharedLib> $<TARGET_FILE_DIR:${target_name}>/
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:JKQTMathTextSharedLib> $<TARGET_FILE_DIR:${target_name}>/
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:JKQTPlotterSharedLib> $<TARGET_FILE_DIR:${target_name}>/
-  )
-
   # On Windows, we must copy the DLLs inside the build folder or it won't find them
   # TODO: IMPORTED_SONAME_RELEASE now contains @rpath so it fails
   # get_target_property(LIBOSLIB openstudio::openstudiolib IMPORTED_LOCATION_RELEASE)
@@ -395,7 +387,7 @@ if( NOT APPLE )
     install(PROGRAMS $<TARGET_FILE_DIR:${target_name}>/D3Dcompiler_47.dll DESTINATION bin/ COMPONENT OpenStudioApp)
     install(PROGRAMS $<TARGET_FILE_DIR:${target_name}>/opengl32sw.dll DESTINATION bin/ COMPONENT OpenStudioApp)
 
-    foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS} ${JKQT_LIBS})
+    foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS})
       install(PROGRAMS $<TARGET_FILE_DIR:${target_name}>/$<TARGET_FILE_NAME:${LIB}> DESTINATION bin/ COMPONENT OpenStudioApp)
     endforeach()
 
@@ -416,7 +408,7 @@ if( NOT APPLE )
     install(DIRECTORY $<TARGET_FILE_DIR:${target_name}>/xcbglintegrations/ DESTINATION bin/xcbglintegrations/ COMPONENT OpenStudioApp)
     # install(PROGRAMS $<TARGET_FILE_DIR:${target_name}>/xcbglintegrations/$<TARGET_FILE_NAME:Qt6::QXcbGlxIntegrationPlugin> DESTINATION bin/xcbglintegrations/ COMPONENT OpenStudioApp)
 
-    foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS} ${JKQT_LIBS})
+    foreach(LIB ${QT_LIBS} ${QT_WEB_LIBS})
       install(PROGRAMS $<TARGET_FILE_DIR:${target_name}>/$<TARGET_FILE_NAME:${LIB}> DESTINATION bin/ COMPONENT OpenStudioApp)
     endforeach()
 

src/openstudio_lib/CMakeLists.txt

@@ -774,7 +774,7 @@ set(${target_name}_depends
   openstudio::openstudiolib
   ${QT_LIBS}
   ${QT_WEB_LIBS}
-  ${JKQT_LIBS}
+  JKQTPlotter${QT_VERSION_MAJOR}::JKQTPlotter${QT_VERSION_MAJOR}
 )
 
 if(WIN32)