diff --git a/Utilities/otbsvm/CMakeLists.txt b/Utilities/otbsvm/CMakeLists.txt
index 4992ef4f37033c54036db34a4cb76946dd921a8b..4a1b2d33cb2e47273b18994abe4e1f63b8cf9854 100755
--- a/Utilities/otbsvm/CMakeLists.txt
+++ b/Utilities/otbsvm/CMakeLists.txt
@@ -11,6 +11,22 @@ SET(OTBSVM_SRCS
 svm.cxx 
 )
 
+# Adjust the compiler flags to avoid problems with ossim code.
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  # Hide warnings in ossim code.
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+
+  # CMake versions before 2.4 did not put the source-file-specific flags
+  # after the directory-level flags.  Remove optimization flags from the
+  # CMAKE_CXX_FLAGS* variables so they can be overridden.
+  IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4)
+    FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
+      STRING(REGEX REPLACE
+        "-O[^ ]*( |$)" "" CMAKE_CXX_FLAGS${c} "${CMAKE_CXX_FLAGS${c}}")
+    ENDFOREACH(c)
+  ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.4)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
 ADD_LIBRARY(otbsvm ${OTBSVM_SRCS})
 TARGET_LINK_LIBRARIES (otbsvm ITKCommon)
 
@@ -21,10 +37,9 @@ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
 ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
 
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
-INSTALL(FILES svm.h
+INSTALL(FILES ${__files}
     DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsvm 
     COMPONENT Development)