bug compilation ...

ThirdParty/README.TXT

-
-AntTweakBar: interface en OpenGL
-gzstream: compression a la volee de fichier par gzip
 Numerical: diverses librariries de resolution de systemes lineaires et autres
 Zinri: lecture/ecriture de fichier inr.gz (image3D inria)
-OpenCTM: sauvegarde/lecture de maillages triangulaires (avec pertes)
-Assimp: import de nombreux type de fichiers
+Assimp: import de nombreux type de fichiers 3D (maillages)
+
+Compilation:
+============
+cd build
+cmake .. ou ccmake .. ou cmake-gui ..
 
-PS: sous windows AntTweakBar/OpenCTM/Assimp sont donnes dans les dependances.
+options (et valeur par defaut)
+	BUILD_SHARED_LIBS  (F)                                                                                                                                                           
+	WITH_ASSIMP        (T)
+	WITH_NUMERICAL     (T)
+	WITH_ZINRI         (T)
+	
+Pour utiliser avec CMake -DOPTION=true/false 

build/CMakeLists.txt

@@ -81,21 +81,21 @@ ENDIF (WITH_QT)
 # qq definition specifiques pour mac
 IF(APPLE)
 # attention a changer pour chercher la bonne version automatiquement
-	SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING)
+	SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" CACHE STRING "developer SDK")
 	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined -Wl,dynamic_lookup")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAC_OSX")
 	SET(CMAKE_OSX_ARCHITECTURES x86_64)
 ENDIF(APPLE)
 
 IF(WIN32)
-	INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/)
-	LINK_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/lib/ ${boost_path}/lib)
+#	INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/)
+#	LINK_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/lib/ ${boost_path}/lib)
 	add_subdirectory(Release)
 	add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
-	if(CMAKE_CONFIGURATION_TYPES)
+#	if(CMAKE_CONFIGURATION_TYPES)
 		set(CMAKE_CONFIGURATION_TYPES Release Debug)
 		set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
-	endif()
+#	endif()
 ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 	add_subdirectory(Release)

build/Debug/CMakeLists.txt

@@ -67,24 +67,29 @@ file(
 	${CGoGN_ROOT_DIR}/include/Utils/Shaders*.geom
 )
 
-#IF(WIN32)
-add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/bin/shader_to_h ${shaders_srcD}
+IF(WIN32)
+	add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/bin/Release/shader_to_h ${shaders_srcD}
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	SOURCES ${shaders_srcD} )
-#ELSE(WIN32)
-#add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/bin/shader_to_h ${shaders_srcD}
-#	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-#	SOURCES ${shaders_srcD} 
-#)
-#ENDIF(WIN32)
+ELSE(WIN32)
+	add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/bin/shader_to_h ${shaders_srcD}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	SOURCES ${shaders_srcD} 
+)
+ENDIF(WIN32)
+
 
 
 file(
-	GLOB
+	GLOB		# WARNING NO MORE RECURSE TO AVOID TAKING QT FILES
 	files_utils
 	${CGoGN_ROOT_DIR}/src/Utils/*.cpp
 	${CGoGN_ROOT_DIR}/include/Utils/*.hpp
 	${CGoGN_ROOT_DIR}/include/Utils/*.h
+	
+	${CGoGN_ROOT_DIR}/src/Utils/Shaders/*.cpp
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders/*.hpp
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders/*.h
 )
 
 IF(WITH_QT)
@@ -102,9 +107,7 @@ IF(WITH_QT)
 	QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers})
 	SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC})
 	add_library( utilsD ${files_utils_withQt} )
-	MESSAGE(STATUS "BIG PB !!!!!!!!!!!!!!!!")
 ELSE(WITH_QT)
-	MESSAGE(STATUS "FILES_UTILS:" ${files_utils})
 	add_library( utilsD ${files_utils} )
 ENDIF (WITH_QT)
 

build/Release/CMakeLists.txt

@@ -11,12 +11,6 @@ ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
 ENDIF(WIN32)
 
-# FOR Qt4
-#SET(QT_USE_QTOPENGL TRUE)
-#INCLUDE(${QT_USE_FILE})
-#ADD_DEFINITIONS(${QT_DEFINITIONS})
-
-
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CGoGN_ROOT_DIR}/include
@@ -101,11 +95,15 @@ ENDIF(WIN32)
 
 
 file(
-	GLOB
+	GLOB		# WARNING NO MORE RECURSE TO AVOID TAKING QT FILES
 	files_utils
 	${CGoGN_ROOT_DIR}/src/Utils/*.cpp
 	${CGoGN_ROOT_DIR}/include/Utils/*.hpp
 	${CGoGN_ROOT_DIR}/include/Utils/*.h
+
+	${CGoGN_ROOT_DIR}/src/Utils/Shaders/*.cpp
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders/*.hpp
+	${CGoGN_ROOT_DIR}/include/Utils/Shaders/*.h
 )
 
 IF(WITH_QT)

include/Utils/textures.h

@@ -31,6 +31,12 @@
 #include <string>
 #include <QImage>
 
+#ifndef WITH_QT
+#error "Texture class need Qt for loading images, please recompile CGoGN with Qt support"
+#endif
+
+// TODO externaliser le chargement d'image pour enlever la dependance Qt ??
+
 
 namespace CGoGN
 {