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

Bug 18113 small code improvements #89

Merged

Conversation

nocnokneo
Copy link
Contributor

A few more small improvements to add.
http://bugs.mitk.org/show_bug.cgi?id=18113

Signed-off-by: Taylor Braun-Jones <taylor.braun-jones@ge.com>
…enabled

Signed-off-by: Taylor Braun-Jones <taylor.braun-jones@ge.com>
Signed-off-by: Taylor Braun-Jones <taylor.braun-jones@ge.com>
Signed-off-by: Taylor Braun-Jones <taylor.braun-jones@ge.com>
@@ -163,7 +163,9 @@ if(MITK_USE_IGT)
endif()

# Install rules for ToF libraries loaded at runtime
include("@MITK_BINARY_DIR@/mitkToFHardwareInstallRules.cmake")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you run into problems with this line of code? The included file already contains checks for ToF features and I doubt that mitkToFHardware_IS_ENABLED would be defined in the CMake scope where MITKConfig.cmake is usually read in.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We disable many MITK modules to speed up our supersuperbuild by simply removing them from module_dirs in Modules/CMakeLists.txt. This has worked well for all modules so far except the ToF modules, so I was just looking for a solution. I thought this still worked for the standard case where the ToF modules are enabled, but maybe I'm mistaken or maybe there's a cleaner/more robust solution?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it will not work in the standard case and would never lead to the inclusion of the ToF install rules file. Thanks for clarifying - in your case the file is never created in the build directory, so I would just add a if(EXISTS ...) statement instead of if(mitkToFHardware_IS_ENABLED).

@saschazelzer saschazelzer merged commit 8dea7bb into MITK:master Oct 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants