make utils compile standalone

utils still were using the combined makefile...
jschleic · May 25, 2012 · 2de7156 · 2de7156
1 parent 49a939b
commit 2de7156
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -1,8 +1,15 @@
+project(sifutils)
+cmake_minimum_required(VERSION 2.8)
+SET(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH}  ${storm_SOURCE_DIR}/../cmake)
+
+FIND_PACKAGE( Vigra 1.8.0 REQUIRED )
+FIND_PACKAGE( HDF5 REQUIRED )
+
 ADD_EXECUTABLE(sif2hdf5 EXCLUDE_FROM_ALL sif2hdf5.cpp)
 ADD_EXECUTABLE(sif2tiff EXCLUDE_FROM_ALL sif2tiff.cpp)
 ADD_EXECUTABLE(hdf52tiff EXCLUDE_FROM_ALL hdf52tiff.cpp)
 ADD_EXECUTABLE(tiff2hdf5 EXCLUDE_FROM_ALL tiff2hdf5.cpp)
-ADD_DEPENDENCIES(experiments sif2hdf5 sif2tiff hdf52tiff tiff2hdf5)
+ADD_CUSTOM_TARGET(sifutils DEPENDS sif2hdf5 sif2tiff hdf52tiff tiff2hdf5)
 TARGET_LINK_LIBRARIES(sif2hdf5 vigraimpex)
 TARGET_LINK_LIBRARIES(sif2tiff vigraimpex)
 TARGET_LINK_LIBRARIES(hdf52tiff vigraimpex)
@@ -15,6 +22,10 @@ ELSE(HDF5_FOUND)
 	message(WARNING "Compiling without HDF5. No hdf5-input will be possible")
 ENDIF(HDF5_FOUND)
 
-ADD_EXECUTABLE(conv_3d convert.cpp)
-INCLUDE_DIRECTORIES (../storm)
+ADD_EXECUTABLE(conv_3d convert.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../storm/myimportinfo.cpp)
+INCLUDE_DIRECTORIES (
+    ${HDF5_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../storm/
+    ${Vigra_INCLUDE_DIRS}
+    )
 TARGET_LINK_LIBRARIES(conv_3d vigraimpex)
diff --git a/util/convert.cpp b/util/convert.cpp
@@ -16,7 +16,7 @@
 #include <map>
 
 #include <vigra/impex.hxx>
-#include "myimportinfo.hxx"
+#include "myimportinfo.h"
 #ifdef HDF5_FOUND
 	#include <vigra/hdf5impex.hxx>
 #endif