Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
d4fe499e
Commit
d4fe499e
authored
Jan 08, 2015
by
Christian Schulte zu Berge
Browse files
Linux CMake fix
parent
8efd27e4
Changes
8
Hide whitespace changes
Inline
Side-by-side
cmake/commonconf.cmake
View file @
d4fe499e
...
...
@@ -151,6 +151,7 @@ ELSEIF(UNIX)
LIST
(
APPEND CampvisGlobalDefinitions
"-DUNIX"
)
LIST
(
APPEND CampvisGlobalDefinitions
"-Wall -Wno-unused-local-typedefs -Wno-unused-variable -Wno-unknown-pragmas"
)
LIST
(
APPEND CampvisGlobalDefinitions
"-D__STDC_CONSTANT_MACROS"
)
ELSE
()
ENDIF
(
WIN32
)
IF
(
CMAKE_COMPILER_IS_GNUCXX
)
...
...
modules/fontrendering/fontrendering.cmake
View file @
d4fe499e
...
...
@@ -3,8 +3,10 @@
IF
(
${
ModuleEnabled
}
)
# dirty, dirty hack to force freetype to build stastic lib
SET
(
bsl
${
BUILD_SHARED_LIBS
}
)
IF
(
${
CampvisSharedStaticModulesFix
}
STREQUAL
"STATIC"
)
SET
(
BUILD_SHARED_LIBS OFF
)
IF
(
CampvisSharedStaticModulesFix
)
IF
(
${
CampvisSharedStaticModulesFix
}
STREQUAL
"STATIC"
)
SET
(
BUILD_SHARED_LIBS OFF
)
ENDIF
()
ENDIF
()
# build RadomWalksLib library
...
...
modules/fontrendering/pipelines/fontrenderingdemo.h
View file @
d4fe499e
...
...
@@ -58,11 +58,11 @@ namespace fontrendering {
TextRenderer
_tr
;
};
}
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
FontRenderingDemo
>;
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
fontrendering
::
FontRenderingDemo
>;
}
}
#endif // FONTRENDERINGDEMO_H__
modules/microscopysegmentation/microscopysegmentation.cmake
View file @
d4fe499e
...
...
@@ -5,8 +5,10 @@ IF(${ModuleEnabled})
# dirty, dirty hack to force AlgLib to build stastic lib on MSVC
SET
(
bsl
${
BUILD_SHARED_LIBS
}
)
IF
(
${
CampvisSharedStaticModulesFix
}
STREQUAL
"STATIC"
)
SET
(
BUILD_SHARED_LIBS OFF
)
IF
(
CampvisSharedStaticModulesFix
)
IF
(
${
CampvisSharedStaticModulesFix
}
STREQUAL
"STATIC"
)
SET
(
BUILD_SHARED_LIBS OFF
)
ENDIF
()
ENDIF
()
ADD_SUBDIRECTORY
(
modules/microscopysegmentation/ext/alglib
)
...
...
modules/workflowdemo/pipelines/imagefiltering.h
View file @
d4fe499e
...
...
@@ -60,10 +60,11 @@ namespace workflowdemo {
GlImageCrop
_glCrop
;
VolumeExplorer
_ve
;
};
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
ImageFiltering
>;
}
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
workflowdemo
::
ImageFiltering
>;
}
#endif // IMAGEFILTERING_H__
modules/workflowdemo/pipelines/imageloading.h
View file @
d4fe499e
...
...
@@ -54,10 +54,11 @@ namespace workflowdemo {
campvis
::
GenericImageReader
_imageReader
;
};
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
ImageLoading
>;
}
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
workflowdemo
::
ImageLoading
>;
}
#endif // IMAGELOADING_H__
modules/workflowdemo/pipelines/imagevis.h
View file @
d4fe499e
...
...
@@ -55,10 +55,11 @@ namespace workflowdemo {
VolumeExplorer
_ve
;
};
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
ImageVis
>;
}
// Instantiate template to register the pipelines.
template
class
PipelineRegistrar
<
workflowdemo
::
ImageVis
>;
}
#endif // IMAGEVIS_H__
modules/workflowdemo/workflows/demoworkflow.h
View file @
d4fe499e
...
...
@@ -79,8 +79,7 @@ namespace workflowdemo {
};
}
template
class
WorkflowRegistrar
<
workflowdemo
::
DemoWorkflow
>;
template
class
WorkflowRegistrar
<
workflowdemo
::
DemoWorkflow
>;
}
#endif // DEMOWORKFLOW_H__
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment