Linux CMake fix

cmake/commonconf.cmake

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -79,8 +79,7 @@ namespace workflowdemo {
     };
 
 }
-
-    template class WorkflowRegistrar<workflowdemo::DemoWorkflow>;
+template class WorkflowRegistrar<workflowdemo::DemoWorkflow>;
 }
 
 #endif // DEMOWORKFLOW_H__