Index: make/FindDoxygen.cmake
===================================================================
--- make/FindDoxygen.cmake	(r�vision 4)
+++ make/FindDoxygen.cmake	(r�vision 205)
@@ -56,30 +56,16 @@
 IF (NOT DOXYGEN_FIND_QUIETLY)
   IF (DOXYGEN_DOT_EXECUTABLE)
     MESSAGE(STATUS "Looking for dot tool... - found ${DOXYGEN_DOT_EXECUTABLE}")
+    GET_FILENAME_COMPONENT(DOXYGEN_DOT_PATH ${DOXYGEN_DOT_EXECUTABLE} PATH CACHE)
   ELSE (DOXYGEN_DOT_EXECUTABLE)
     MESSAGE(STATUS "Looking for dot tool... - NOT found")
   ENDIF (DOXYGEN_DOT_EXECUTABLE)
 ENDIF (NOT DOXYGEN_FIND_QUIETLY)
 
-
-# The Doxyfile wants the path to Dot, not the entire path and executable
-# so for convenience, I'll add another search for DOXYGEN_DOT_PATH.
-FIND_PATH(DOXYGEN_DOT_PATH
-  dot
-  "C:/Program Files/ATT/Graphviz/bin"
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
-  /Applications/Graphviz.app/Contents/MacOS
-  /Applications/Doxygen.app/Contents/Resources
-  /Applications/Doxygen.app/Contents/MacOS
-  /usr/bin
-  /usr/local/bin
-  DOC "Path to the Graphviz Dot tool"
-)
-
 MARK_AS_ADVANCED(
   DOXYGEN_FOUND,
   DOXYGEN_EXECUTABLE,
   DOXYGEN_DOT_FOUND,
   DOXYGEN_DOT_EXECUTABLE,
   DOXYGEN_DOT_PATH,
-  )
\ Pas de fin de ligne � la fin du fichier.
+  )
Index: make/pieuvre_tsp_graph.bmp
===================================================================
Ne peut afficher : fichier considéré comme binaire.
svn:mime-type = application/octet-stream

Modification de propri�t�s sur make/pieuvre_tsp_graph.bmp
___________________________________________________________________
Nom : svn:mime-type
   + application/octet-stream

Index: make/TSPCMakeTools.cmake
===================================================================
--- make/TSPCMakeTools.cmake	(r�vision 4)
+++ make/TSPCMakeTools.cmake	(r�vision 205)
@@ -1,20 +1,41 @@
-SET(XSCRIPT_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/exec/scripts)
+SET(XSCRIPT_OUTPUT_PATH ${CMAKE_BINARY_DIR}/scripts)
 MAKE_DIRECTORY(${XSCRIPT_OUTPUT_PATH})
 # define TSP_XSCRIPT MACRO
 MACRO(TSP_XSCRIPT)
   FOREACH(SCRIPT_FILE ${ARGV})
     GET_FILENAME_COMPONENT(FN ${SCRIPT_FILE} NAME)
     CONFIGURE_FILE(${SCRIPT_FILE} ${XSCRIPT_OUTPUT_PATH}/${FN} COPYONLY)
+    INSTALL(
+      PROGRAMS ${XSCRIPT_OUTPUT_PATH}/${FN}
+      DESTINATION scripts)
   ENDFOREACH(SCRIPT_FILE)
 ENDMACRO(TSP_XSCRIPT)
 
-SET(XINCLUDE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/exec/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}/include)
+SET(XINCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/${CMAKE_BUILD_TYPE}/include)
 MAKE_DIRECTORY(${XINCLUDE_OUTPUT_PATH})
 # define TSP_XINCLUDE MACRO
 MACRO(TSP_XINCLUDE)
+  SET (TSP_XINCLUDE_DIR_FOUND "YES")
+  SET (INCLUDE_DIR )
   FOREACH(INCLUDE_FILE ${ARGV})
-    GET_FILENAME_COMPONENT(FN ${INCLUDE_FILE} NAME)
-    CONFIGURE_FILE(${INCLUDE_FILE} ${XINCLUDE_OUTPUT_PATH}/${FN} COPYONLY)
+	IF (INCLUDE_FILE STREQUAL "DIRECTORY")
+		SET (TSP_XINCLUDE_DIR_FOUND "NO")
+	ENDIF (INCLUDE_FILE STREQUAL "DIRECTORY")	
+	
+	IF (TSP_XINCLUDE_DIR_FOUND)
+		# handle missing extension
+		IF (NOT "${INCLUDE_FILE}" MATCHES ".h" AND NOT "${INCLUDE_FILE}" MATCHES ".H")
+			SET(INCLUDE_FILE ${INCLUDE_FILE}.h)
+		ENDIF ( NOT "${INCLUDE_FILE}" MATCHES ".h" AND NOT "${INCLUDE_FILE}" MATCHES ".H") 
+		GET_FILENAME_COMPONENT(FN ${INCLUDE_FILE} NAME)
+		CONFIGURE_FILE(${INCLUDE_FILE} ${XINCLUDE_OUTPUT_PATH}${INCLUDE_DIR}/${FN} COPYONLY)
+		INSTALL_FILES(/include${INCLUDE_DIR} .h ${XINCLUDE_OUTPUT_PATH}${INCLUDE_DIR}/${FN})
+	ELSE (TSP_XINCLUDE_DIR_FOUND)
+		IF (NOT INCLUDE_FILE STREQUAL "DIRECTORY")
+			SET (INCLUDE_DIR /${INCLUDE_FILE})
+			SET (TSP_XINCLUDE_DIR_FOUND "YES")
+		ENDIF (NOT INCLUDE_FILE STREQUAL "DIRECTORY")
+	ENDIF (TSP_XINCLUDE_DIR_FOUND)
   ENDFOREACH(INCLUDE_FILE)
 ENDMACRO(TSP_XINCLUDE)
 
@@ -23,6 +44,63 @@
   CONFIGURE_FILE(${ARGV})
 ENDMACRO(TSP_CONFIGURE_FILE_AUTOTOOLS_COMPAT)
 
+MACRO(TSP_PROGRAM_INSTALL)
+  INSTALL(
+    TARGETS ${ARGV}
+    DESTINATION bin)
+  IF (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+	FOREACH(SCRIPT_FILE ${ARGV})
+		INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${SCRIPT_FILE}.pdb 
+				DESTINATION bin)
+	ENDFOREACH(SCRIPT_FILE)
+  ENDIF (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ENDMACRO(TSP_PROGRAM_INSTALL)
+
+MACRO(TSP_LIBRARY_INSTALL)
+  INSTALL(
+    TARGETS ${ARGV}
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    )
+  IF (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+	FOREACH(SCRIPT_FILE ${ARGV})
+		INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${SCRIPT_FILE}.pdb 
+				DESTINATION bin)
+	ENDFOREACH(SCRIPT_FILE)
+  ENDIF (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ENDMACRO(TSP_LIBRARY_INSTALL)
+
+MACRO(TSP_XSHAREDLIB)
+  FOREACH(SHARED_LIB ${ARGV})
+    GET_FILENAME_COMPONENT(FN ${SHARED_LIB} NAME)
+    
+    SET(XSEARCH_PATH ${LIBRARY_OUTPUT_PATH})
+	SET(XCOPY_PATH ${EXECUTABLE_OUTPUT_PATH})
+    
+	IF (WIN32)
+	
+		SET(XSEARCH_PATH ${XSEARCH_PATH}/${CMAKE_BUILD_TYPE})
+		SET(XCOPY_PATH ${XCOPY_PATH}/${CMAKE_BUILD_TYPE})
+		
+	ENDIF (WIN32)
+	
+	FIND_LIBRARY(X_LIBRARY 
+		NAMES ${FN}
+		PATHS ${XSEARCH_PATH}
+		DOC "The X Library")
+		
+	IF (X_LIBRARY)
+
+		CONFIGURE_FILE(${XSEARCH_PATH}/${SHARED_LIB} ${XCOPY_PATH}/${FN} COPYONLY)
+		
+	ENDIF (X_LIBRARY)
+	
+  ENDFOREACH(SHARED_LIB)
+ENDMACRO(TSP_XSHAREDLIB)
+
+
+
 MARK_AS_ADVANCED(
   XSCRIPT_OUTPUT_PATH
   XINCLUDE_OUTPUT_PATH
Index: make/FindLexYacc.cmake
===================================================================
--- make/FindLexYacc.cmake	(r�vision 4)
+++ make/FindLexYacc.cmake	(r�vision 205)
@@ -1,7 +1,10 @@
+
+SET(PATH_DIR /usr/local/bin /usr/bin)
+
 MESSAGE(STATUS "Looking for lex...")
 FIND_PROGRAM(LEX_PROGRAM 
   NAMES lex flex 
-  PATHS /usr/local/bin /usr/bin
+  PATHS ${PATH_DIR}
   DOC "A lex-compatible lexer generator")
 IF (LEX_PROGRAM) 
   MESSAGE(STATUS "Looking for lex... - found lex is ${LEX_PROGRAM}")
@@ -13,12 +16,17 @@
 
 MESSAGE(STATUS "Looking for yacc...")
 FIND_PROGRAM(YACC_PROGRAM 
-  NAMES yacc bison
-  PATHS /usr/local/bin /usr/bin
+  NAMES yacc yacc.bison bison
+  PATHS ${PATH_DIR}
   DOC "A yacc-compatible parser generator")
 IF (YACC_PROGRAM) 
   SET(YACC_FOUND "YES")
   MESSAGE(STATUS "Looking for yacc... - found yacc is ${YACC_PROGRAM}")
+  IF ("${YACC_PROGRAM}" MATCHES ".*bison.*")
+    SET(YACC_COMPAT_ARG -y)
+  ELSE ("${YACC_PROGRAM}" MATCHES ".*bison.*")
+    SET(YACC_COMPAT_ARG  )
+  ENDIF ("${YACC_PROGRAM}" MATCHES ".*bison.*")
 ELSE (YACC_PROGRAM)
   SET(YACC_FOUND "NO")
   MESSAGE(STATUS "Looking for yacc... - NOT found")
Index: make/FindACPLT_ONCRPC.cmake
===================================================================
--- make/FindACPLT_ONCRPC.cmake	(r�vision 0)
+++ make/FindACPLT_ONCRPC.cmake	(r�vision 205)
@@ -0,0 +1,73 @@
+
+SET(PATH_DIR ${CMAKE_SOURCE_DIR}/external/ACPLT-ONCRPC c:/oncrpc)
+
+MESSAGE(STATUS "Looking for ACPLT_ONCRPC...")
+
+FIND_FILE(ACPLT_ONCRPC_INCLUDE
+	NAMES rpc.h xdr.h
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES include/rpc rpc
+	DOC "The ACPLT_ONCRPC Include Files"
+	NO_DEFAULT_PATH)
+
+FIND_LIBRARY(ACPLT_ONCRPC_LIBRARY
+	NAMES oncrpc
+	PATHS ${PATH_DIR}	
+	PATH_SUFFIXES lib librpc
+	DOC "The ACPLT_ONCRPC Library")
+
+FIND_PROGRAM(ACPLT_ONCRPC_INSTALL
+	NAMES acplt-oncrpc-1.14.3-tsp1.zip
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES source
+	DOC "The ACPLT_ONCRPC install program")
+		
+FIND_FILE(ACPLT_ONCRPC_ETC
+	NAMES rpc
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES etc
+	DOC "The ACPLT_ONCRPC config Files"
+	NO_DEFAULT_PATH)
+
+MESSAGE(STATUS "Looking for rpcgen...")
+FIND_PROGRAM(RPCGEN_PROGRAM 
+  NAMES rpcgen 
+  PATHS ${PATH_DIR}
+  PATH_SUFFIXES bin
+  DOC "A rpc generator")
+
+IF (RPCGEN_PROGRAM) 
+  MESSAGE(STATUS "Looking for rpcgen... - found rpcgen is ${RPCGEN_PROGRAM}")
+  SET(RPCGEN_FOUND "YES")
+ELSE (RPCGEN_PROGRAM) 
+  SET(RPCGEN_FOUND "NO")
+  MESSAGE(STATUS "Looking for rpcgen... - NOT found")
+ENDIF (RPCGEN_PROGRAM) 
+
+###########################################
+# TO DO : Find the DLL
+###########################################
+
+IF (ACPLT_ONCRPC_INCLUDE AND ACPLT_ONCRPC_LIBRARY)
+
+  MESSAGE(STATUS "Looking for ACPLT_ONCRPC... - found ACPLT_ONCRPC lib : ${ACPLT_ONCRPC_LIBRARY}, include is ${ACPLT_ONCRPC_INCLUDE}")
+  SET(ACPLT_ONCRPC_FOUND "YES")
+  GET_FILENAME_COMPONENT(ACPLT_ONCRPC_BINARY_DIRS ${RPCGEN_PROGRAM} PATH)
+  GET_FILENAME_COMPONENT(ACPLT_ONCRPC_LIBRARY_DIRS ${ACPLT_ONCRPC_LIBRARY} PATH)
+  GET_FILENAME_COMPONENT(ACPLT_INCLUDE_DIR1 ${ACPLT_ONCRPC_INCLUDE} PATH)
+  GET_FILENAME_COMPONENT(ACPLT_INCLUDE_DIR2 ${ACPLT_INCLUDE_DIR1} PATH)
+  # Suming up the search directory which may contents the onc-rpc includes
+  SET(ACPLT_ONCRPC_INCLUDE_DIRS ${ACPLT_INCLUDE_DIR1} ${ACPLT_INCLUDE_DIR2})  
+ELSE (ACPLT_ONCRPC_INCLUDE AND ACPLT_ONCRPC_LIBRARY)
+
+  SET(ACPLT_ONCRPC_FOUND "NO")
+  MESSAGE(STATUS "Looking for ACPLT_ONCRPC... - NOT found")
+
+ENDIF (ACPLT_ONCRPC_INCLUDE AND ACPLT_ONCRPC_LIBRARY)
+
+
+IF (ACPLT_ONCRPC_ETC)
+  GET_FILENAME_COMPONENT(ACPLT_ONCRPC_ETC_DIR ${ACPLT_ONCRPC_ETC} PATH)
+ELSE (ACPLT_ONCRPC_ETC)
+  SET(ACPLT_ETC_DIR "unknown-notfound")
+ENDIF (ACPLT_ONCRPC_ETC)
Index: make/FindPthreadWin32.cmake
===================================================================
--- make/FindPthreadWin32.cmake	(r�vision 0)
+++ make/FindPthreadWin32.cmake	(r�vision 205)
@@ -0,0 +1,36 @@
+
+SET(PATH_DIR ${CMAKE_SOURCE_DIR}/external/pthreadwin32 c:/pthreadwin32)
+
+MESSAGE(STATUS "Looking for PthreadWin32...")
+
+FIND_FILE(PTHREADWIN32_INCLUDE
+	NAMES pthread.h sched.h semaphore.h
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES include pthreads
+	DOC "The PthreadWin32 Include Files")
+	
+FIND_LIBRARY(PTHREADWIN32_LIBRARY
+	NAMES pthreadVC pthreadVC1
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES lib pthreads
+	DOC "The PthreadWin32 Library")
+	
+FIND_PROGRAM(PTHREADWIN32_INSTALL
+	NAMES pthreads-2005-03-08.exe
+	PATHS ${PATH_DIR}
+	PATH_SUFFIXES source
+	DOC "The PthreadWin32 install program")
+
+###########################################
+# TO DO : Find the DLL : pthreadVC*.dll
+###########################################
+
+IF (PTHREADWIN32_INCLUDE AND PTHREADWIN32_LIBRARY)
+  MESSAGE(STATUS "Looking for PthreadWin32... - found PthreadWin32 lib is ${PTHREADWIN32_LIBRARY} and include is ${PTHREADWIN32_INCLUDE}")
+  SET(PTHREADWIN32_FOUND "YES")
+  GET_FILENAME_COMPONENT(PTHREADWIN32_LIBRARY_DIRS ${PTHREADWIN32_LIBRARY} PATH)
+  GET_FILENAME_COMPONENT(PTHREADWIN32_INCLUDE_DIRS ${PTHREADWIN32_INCLUDE} PATH)
+ELSE (PTHREADWIN32_INCLUDE AND PTHREADWIN32_LIBRARY)
+  SET(PTHREADWIN32_FOUND "NO")
+  MESSAGE(STATUS "Looking for PthreadWin32... - NOT found")
+ENDIF (PTHREADWIN32_INCLUDE AND PTHREADWIN32_LIBRARY)
Index: make/FindUWin.cmake
===================================================================
--- make/FindUWin.cmake	(r�vision 0)
+++ make/FindUWin.cmake	(r�vision 205)
@@ -0,0 +1,28 @@
+
+SET(PATH_DIR "C:/Program Files/UWIN/usr")
+
+MESSAGE(STATUS "Looking for UWin...")
+
+FIND_FILE(UWIN_INCLUDE
+	NAMES uwin.h pthread.h
+	PATHS ${PATH_DIR}/include
+	DOC "The UWin Include Files")
+	
+FIND_LIBRARY(UWIN_LIBRARY
+	NAMES pthread posix
+	PATHS ${PATH_DIR}/lib
+	DOC "The UWin Library")
+
+###########################################
+# TO DO : Find the DLL
+###########################################
+
+IF (UWIN_INCLUDE AND UWIN_LIBRARY)
+  MESSAGE(STATUS "Looking for UWin... - found UWin lib is ${UWIN_LIBRARY} and include is ${UWIN_INCLUDE}")
+  SET(UWIN_FOUND "YES")
+  GET_FILENAME_COMPONENT(UWIN_LIBRARY_DIRS ${UWIN_LIBRARY} PATH)
+  GET_FILENAME_COMPONENT(UWIN_INCLUDE_DIRS ${UWIN_INCLUDE} PATH)
+ELSE (UWIN_INCLUDE AND UWIN_LIBRARY)
+  SET(UWIN_FOUND "NO")
+  MESSAGE(STATUS "Looking for UWin... - NOT found")
+ENDIF (UWIN_INCLUDE AND UWIN_LIBRARY)
\ Pas de fin de ligne � la fin du fichier.
