From c542f0944852e052c24498f33e71067f9922376f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de> Date: Fri, 19 Nov 2021 12:10:04 +0100 Subject: [PATCH 1/3] Added option to disable internal glew --- CoreApp/CMakeLists.txt | 2 +- .../DeveloperHelpSources/changelog.docu | 2 ++ cmake/CMakeLists.txt | 16 ++++++++++++++-- cmake/FindQWT6.cmake | 2 -- libs_required/ACG/CMakeLists.txt | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt index be2eaa98..d3913a4a 100755 --- a/CoreApp/CMakeLists.txt +++ b/CoreApp/CMakeLists.txt @@ -354,7 +354,7 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING} ${OPENGL_LIBRARIES} ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${OPENFLIPPER_STATIC_PLUGINS} - libglew_shared + ${GLEW_TARGET} ) diff --git a/Documentation/DeveloperHelpSources/changelog.docu b/Documentation/DeveloperHelpSources/changelog.docu index dee62811..7cf8d749 100644 --- a/Documentation/DeveloperHelpSources/changelog.docu +++ b/Documentation/DeveloperHelpSources/changelog.docu @@ -18,6 +18,8 @@ - Updated histogram class - <b>Build System</b> - Removed glob file operation for coreapp and pluginlib (They have to be explicitly added to the cmake file now) + - Added option to disable internal glew (OPENFLIPPER_DISABLE_INTERNAL_GLEW) + - Support for QT6 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 938d4b2f..c5ae3236 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -21,7 +21,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libs_required/OpenMesh) endif() # Select appropriate C++ version. - set(OPENFLIPPER_CXX_STANDARD 11 CACHE STRING "C++ standard version to use") set_property(CACHE OPENFLIPPER_CXX_STANDARD PROPERTY STRINGS 11 14 17 20 23) set(CMAKE_CXX_STANDARD ${OPENFLIPPER_CXX_STANDARD}) @@ -285,7 +284,20 @@ enable_testing() # Build all additional libraries # ======================================================================== -add_subdirectory (OpenFlipper/libs_required/glew-cmake) + +if (NOT DEFINED OPENFLIPPER_DISABLE_INTERNAL_GLEW) + set(OPENFLIPPER_DISABLE_INTERNAL_GLEW "FALSE" CACHE BOOL "Choose if OpenFlipper should build and use the internal glew library" FORCE) +endif() + +if (NOT OPENFLIPPER_DISABLE_INTERNAL_GLEW) + add_subdirectory (OpenFlipper/libs_required/glew-cmake) + set(GLEW_TARGET libglew_shared) +else() + message("Using external GLEW") + find_package(GLEW) + set(GLEW_TARGET GLEW::glew) +endif() + add_subdirectory (OpenFlipper/libs_required/OpenMesh) add_subdirectory (OpenFlipper/libs_required/ACG) diff --git a/cmake/FindQWT6.cmake b/cmake/FindQWT6.cmake index 507a713b..9fc6c164 100644 --- a/cmake/FindQWT6.cmake +++ b/cmake/FindQWT6.cmake @@ -77,9 +77,7 @@ if (QT5_FOUND) else() message(" VERSION : ${Qt_VERSION_STRING}") if (QT6_FOUND) - message("kkkkkkkkkkkkkkk") if (${Qt_VERSION_STRING} VERSION_EQUAL "6.2.1") - message("llllllllllll") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.2.0-qt6.2.1") endif() else() diff --git a/libs_required/ACG/CMakeLists.txt b/libs_required/ACG/CMakeLists.txt index cc88ac62..ff666992 100644 --- a/libs_required/ACG/CMakeLists.txt +++ b/libs_required/ACG/CMakeLists.txt @@ -371,7 +371,7 @@ target_link_libraries ( ACG ${OPENMESH_LIBRARIES} ${OPENGL_LIBRARIES} ${ADDITIONAL_LINK_LIBRARIES} ${QT_TARGET}::Core ${QT_TARGET}::Widgets ${QT_TARGET}::OpenGL ${QT_TARGET}::Network - libglew_shared ) + ${GLEW_TARGET} ) if (QT6_FOUND) target_link_libraries( ACG ${QT_TARGET}::OpenGLWidgets ) -- GitLab From 8f5bfab844181ca9ae0b859886d698a13a3a2f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de> Date: Fri, 19 Nov 2021 12:13:25 +0100 Subject: [PATCH 2/3] Added option to disable internal glew --- cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c5ae3236..6485606b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -163,7 +163,7 @@ if ( WIN32 ) endif() endif() -set (OF_MAX_QT_VERSION "5.15.2") +set (OF_MAX_QT_VERSION "6.2.1") if (${Qt_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION}) message(WARNING "Detected QT Version ( ${Qt_VERSION_STRING} ) higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.") -- GitLab From c7f9133253829bedd9cb63cb7d1ce6b335876f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de> Date: Fri, 19 Nov 2021 12:45:56 +0100 Subject: [PATCH 3/3] Link tests to glew --- libs_required/ACG/.CMakeLists.txt.swp | Bin 0 -> 24576 bytes libs_required/ACG/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 libs_required/ACG/.CMakeLists.txt.swp diff --git a/libs_required/ACG/.CMakeLists.txt.swp b/libs_required/ACG/.CMakeLists.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..71e8dd4b11b0b736598082f2fcfb5afab557d5bc GIT binary patch literal 24576 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 CjVy8i literal 0 HcmV?d00001 diff --git a/libs_required/ACG/CMakeLists.txt b/libs_required/ACG/CMakeLists.txt index ff666992..53e023ed 100644 --- a/libs_required/ACG/CMakeLists.txt +++ b/libs_required/ACG/CMakeLists.txt @@ -436,7 +436,7 @@ if (GTEST_FOUND) ) target_link_libraries(ACG_tests - ${GTEST_LIBRARIES} ${OPENMESH_LIBRARIES} ACG + ${GTEST_LIBRARIES} ${OPENMESH_LIBRARIES} ACG ${GLEW_TARGET} ) add_test(NAME AllTestsIn_ACG_tests COMMAND ${OUT_DIR}/ACG_tests) -- GitLab