diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index d1696e55bb602310afdca9f34062684e41385bb3..b61084c9d56e15d6dec10f99ce8b0280b6b6e35e 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -2,15 +2,12 @@
 
 PROJECT(corpus2SwigWrap)
 
-#find_package(Corpus2 1.0.8 REQUIRED)
 set(CORPUS2_LIBS corpus2)
-
-#find_package(PwrUtils 1.0.1 REQUIRED)
 set(PWRUTILS_LIBS pwrutils)
 set(CORPUS2_PWR_LIBS ${CORPUS2_LIBS} ${PWRUTILS_LIBS})
 
-include_directories (${Libcorpus2_SOURCE_DIR} "../libcorpus2")
-include_directories (${Libpwrutils_SOURCE_DIR} "../libpwrutils")
+include_directories (${corpus2_SOURCE_DIR})
+include_directories (${pwrutils_SOURCE_DIR})
 
 link_directories(${Libcorpus2_BINARY_DIR})
 
@@ -31,6 +28,12 @@ message(STATUS "INFO: " "python lib: ${PYTHON_INSTDIR}" )
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
+if(CMAKE_COMPILER_IS_GNUCXX)
+	set(CMAKE_CXX_FLAGS "-ansi $ENV{CXXFLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -ansi $ENV{CXXFLAGS}")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-omit-frame-pointer")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------