The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 5791fec6 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed module CMake files not setting ThisModShaderDirectories correctly in...

Fixed module CMake files not setting ThisModShaderDirectories correctly in case of multiple directories.
parent 1a31279d
......@@ -24,8 +24,8 @@ IF(${ModuleEnabled})
FILE(GLOB ThisModApplicationHeaders RELATIVE ${ModulesDir} modules/advancedusvis/widgets/*.h)
FILE(GLOB ThisModApplicationToBeMocced RELATIVE ${ModulesDir} modules/advancedusvis/widgets/*.h)
SET(ThisModShaderDirectories "modules/advancedusvis/glsl")
SET(ThisModShaderDirectories "modules/advancedusvis/sampledata")
LIST(APPEND ThisModShaderDirectories "modules/advancedusvis/glsl")
LIST(APPEND ThisModShaderDirectories "modules/advancedusvis/sampledata")
SET(ThisModDependencies vis io preprocessing randomwalk)
ENDIF(${ModuleEnabled})
......
......@@ -33,5 +33,5 @@ IF(${ModuleEnabled})
SET(ThisModDependencies vis)
ENDIF(${ModuleEnabled})
SET(ThisModStatus TESTING)
SET(ThisModStatus EXPERIMENTAL)
SET(ThisModExternalDependencies TRUE)
......@@ -18,7 +18,7 @@ IF(${ModuleEnabled})
modules/columbia/processors/*.h
)
SET(ThisModShaderDirectories "modules/columbia/glsl")
LIST(APPEND ThisModShaderDirectories "modules/columbia/glsl")
ENDIF(${ModuleEnabled})
SET(ThisModStatus EXPERIMENTAL)
......
......@@ -2,7 +2,7 @@
# CMake file for the cuda confidence maps module
# Set module status (valid values are STABLE, TESTING and EXPERIMENTAL)
SET(ThisModStatus EXPERIMENTAL)
SET(ThisModStatus TESTING)
# Set whether this module has external dependencies that are not shipped with CAMPVis.
SET(ThisModExternalDependencies TRUE)
......@@ -28,7 +28,7 @@ IF(ModuleEnabled)
)
# Define the GLSL shader path, so that all needed shaders will be deployed to target directory
SET(ThisModShaderDirectories "modules/cudaconfidencemaps/glsl")
LIST(APPEND ThisModShaderDirectories "modules/cudaconfidencemaps/glsl")
# Define dependency modules
SET(ThisModDependencies preprocessing advancedusvis openigtlink fontrendering)
......
......@@ -18,7 +18,7 @@ IF(${ModuleEnabled})
modules/dti/processors/*.h
)
SET(ThisModShaderDirectories "modules/dti/glsl")
LIST(APPEND ThisModShaderDirectories "modules/dti/glsl")
ENDIF(${ModuleEnabled})
SET(ThisModStatus TESTING)
......
......@@ -33,11 +33,11 @@ IF(${ModuleEnabled})
modules/fontrendering/tools/*.h
)
LIST (APPEND ThisModShaderDirectories "modules/fontrendering/fonts")
LIST (APPEND ThisModShaderDirectories "modules/fontrendering/glsl")
LIST(APPEND ThisModShaderDirectories "modules/fontrendering/fonts")
LIST(APPEND ThisModShaderDirectories "modules/fontrendering/glsl")
SET(ThisModDependencies base)
ENDIF(${ModuleEnabled})
SET(ThisModStatus TESTING)
SET(ThisModStatus STABLE)
SET(ThisModExternalDependencies FALSE)
......@@ -16,7 +16,7 @@ IF(${ModuleEnabled})
modules/ivus_tc/processors/*.h
)
SET(ThisModShaderDirectories "modules/ivus_tc/glsl")
LIST(APPEND ThisModShaderDirectories "modules/ivus_tc/glsl")
SET(ThisModDependencies base io devil vis advancedusvis)
ENDIF(${ModuleEnabled})
......
......@@ -15,7 +15,7 @@ IF(${ModuleEnabled})
modules/ixpv/processors/*.h
)
SET(ThisModShaderDirectories "modules/ixpv/glsl")
LIST(APPEND ThisModShaderDirectories "modules/ixpv/glsl")
SET(ThisModDependencies vis devil io)
ENDIF(${ModuleEnabled})
......
......@@ -16,7 +16,7 @@ IF(${ModuleEnabled})
modules/manualsegmentation/tools/*.h
)
SET(ThisModShaderDirectories "modules/manualsegmentation/glsl")
LIST(APPEND ThisModShaderDirectories "modules/manualsegmentation/glsl")
SET(ThisModDependencies io itk vis)
ENDIF(${ModuleEnabled})
......
......@@ -30,5 +30,5 @@ IF(${ModuleEnabled})
)
ENDIF(${ModuleEnabled})
SET(ThisModStatus STABLE)
SET(ThisModStatus TESTING)
SET(ThisModExternalDependencies FALSE)
......@@ -18,8 +18,8 @@ IF(${ModuleEnabled})
modules/neuro/tools/*.h
)
SET(ThisModShaderDirectories "modules/neuro/glsl")
SET(ThisModShaderDirectories "modules/neuro/sampledata")
LIST(APPEND ThisModShaderDirectories "modules/neuro/glsl")
LIST(APPEND ThisModShaderDirectories "modules/neuro/sampledata")
SET(ThisModDependencies base io preprocessing vis)
ENDIF(${ModuleEnabled})
......
......@@ -2,7 +2,7 @@
# CMake file for the openigtlink module
# Set module status (valid values are STABLE, TESTING and EXPERIMENTAL)
SET(ThisModStatus EXPERIMENTAL)
SET(ThisModStatus TESTING)
# Set whether this module has external dependencies that are not shipped with CAMPVis.
SET(ThisModExternalDependencies TRUE)
......
......@@ -16,7 +16,7 @@ IF(${ModuleEnabled})
modules/preprocessing/tools/*.h
)
SET(ThisModShaderDirectories "modules/preprocessing/glsl")
LIST(APPEND ThisModShaderDirectories "modules/preprocessing/glsl")
SET(ThisModDependencies vis)
ENDIF(${ModuleEnabled})
......
......@@ -24,7 +24,7 @@ IF(${ModuleEnabled})
modules/registration/tools/*.h
)
SET(ThisModShaderDirectories "modules/registration/glsl")
LIST(APPEND ThisModShaderDirectories "modules/registration/glsl")
SET(ThisModDependencies vis io)
ENDIF(${ModuleEnabled})
......
......@@ -14,8 +14,8 @@ IF(${ModuleEnabled})
modules/tensor/pipelines/*.h
)
SET(ThisModShaderDirectories "modules/tensor/glsl")
SET(ThisModShaderDirectories "modules/tensor/sampledata")
LIST(APPEND ThisModShaderDirectories "modules/tensor/glsl")
LIST(APPEND ThisModShaderDirectories "modules/tensor/sampledata")
SET(ThisModDependencies io vis)
ENDIF(${ModuleEnabled})
......
......@@ -15,8 +15,8 @@ IF(${ModuleEnabled})
modules/vectorfield/pipelines/*.h
)
SET(ThisModShaderDirectories "modules/vectorfield/glsl")
SET(ThisModShaderDirectories "modules/vectorfield/sampledata")
LIST(APPEND ThisModShaderDirectories "modules/vectorfield/glsl")
LIST(APPEND ThisModShaderDirectories "modules/vectorfield/sampledata")
SET(ThisModDependencies io vis)
ENDIF(${ModuleEnabled})
......
......@@ -18,8 +18,8 @@ IF(${ModuleEnabled})
modules/vis/tools/*.h
)
SET(ThisModShaderDirectories "modules/vis/glsl")
SET(ThisModShaderDirectories "modules/vis/sampledata")
LIST(APPEND ThisModShaderDirectories "modules/vis/glsl")
LIST(APPEND ThisModShaderDirectories "modules/vis/sampledata")
SET(ThisModDependencies base io)
ENDIF(${ModuleEnabled})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment