Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

forward declare all svm types #5762

Merged
merged 3 commits into from
Jan 26, 2022
Merged

Conversation

timosachsenberg
Copy link
Contributor

@timosachsenberg timosachsenberg commented Jan 25, 2022

Description

removes svm.h includes from header files

Checklist:

  • Make sure that you are listed in the AUTHORS file
  • Add relevant changes and new features to the CHANGELOG file
  • I have commented my code, particularly in hard-to-understand areas
  • New and existing unit tests pass locally with my changes
  • Updated or added python bindings for changed or new classes. (Tick if no updates were necessary.)

How can I get additional information on failed tests during CI:

If your PR is failing you can check out

Note:

  • Once you opened a PR try to minimize the number of pushes to it as every push will trigger CI (automated builds and test) and is rather heavy on our infrastructure (e.g., if several pushes per day are performed).

Advanced commands (admins / reviewer only):

  • /rebase will try to rebase the PR on the current develop branch.
  • /reformat (experimental) applies the clang-format style changes as additional commit
  • setting the label NoJenkins will skip tests for this PR on jenkins (saves resources e.g., on edits that do not affect tests)

@timosachsenberg
Copy link
Contributor Author

rebuild jenkins

@timosachsenberg
Copy link
Contributor Author

timosachsenberg commented Jan 26, 2022

builds pass.
changing the CMakeList leads to errors in TOPP so probably some changes are needed.
I omitted the CMake change so we can merge this now.

diff --git a/src/openms/CMakeLists.txt b/src/openms/CMakeLists.txt
index 6ffaf41881..0d2ed6d3ae 100644
--- a/src/openms/CMakeLists.txt
+++ b/src/openms/CMakeLists.txt
@@ -128,7 +128,6 @@ foreach (includedir
          ${SEQAN_INCLUDE_DIRS}
          ${SQLite_INCLUDE_DIR}
          ${HDF5_INCLUDE_DIRS}
-         ${LIBSVM_INCLUDE_DIRS}
          ${EIGEN3_INCLUDE_DIR}
          ${WM5_INCLUDE_DIRS}
          ${CRAWDAD_INCLUDE_DIRS}
@@ -154,6 +153,7 @@ openms_add_library(TARGET_NAME  OpenMS
                    PRIVATE_INCLUDES ${EOL_BSPLINE_INCLUDE_DIRECTORY}
                                     ${ISOSPEC_INCLUDE_DIRECTORY}
                                     ${JSON_INCLUDE_DIRECTORY}
+                                    ${LIBSVM_INCLUDE_DIRS} #from contrib
                    EXTERNAL_INCLUDES ${OPENMS_CONTRIB_INCLUDE_DIRS} #root folder
                                      ${EVERGREEN_INCLUDE_DIRECTORY}
                                      ${SEQAN_INCLUDE_DIRECTORY}

@timosachsenberg timosachsenberg merged commit 16a9b45 into develop Jan 26, 2022
@timosachsenberg timosachsenberg deleted the feature/forward_declare_svm branch January 26, 2022 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants