diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4381c67b7cf086bb211396bf822c4e03080b7f8b..bc18907e6f10de0dceb76753fd77df7cfdd4ea15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,14 @@ SET(PROJECT_VERSION ${${PROJECT_NAME}_VERSION})
 
 SET(CMAKE_VERBOSE_MAKEFILE true)
 
+
+# Get the OS
+SET(OS ${CMAKE_SYSTEM_NAME})
+
+#----------------------------------------------------
+# --- GENERIC FLAGS ---------------------------------
+#----------------------------------------------------
+# Specify the compile flags for the overall library.
 IF(WIN32)
   SET(LIBDIR_KW "/LIBPATH:")
   SET(LIBINCL_KW "")
@@ -28,6 +36,37 @@ IF(UNIX)
   SET(LIB_EXT "")
 ENDIF(UNIX)
 
+# Link flags
+SET(${PROJECT_NAME}_LINK_SRC_FLAGS "")
+SET(${PROJECT_NAME}_LINK_FLAGS "${LIBDIR_KW}${${PROJECT_NAME}_BINARY_DIR}/lib ")
+SET(${PROJECT_NAME}_LINK_FLAGS "${${PROJECT_NAME}_LINK_FLAGS} ${LIBINCLUSION_KW}${${PROJECT_NAME}_INTERN_LIBS}${LIBINCLUSION_EXT}")
+IF(UNIX)
+  SET(${PROJECT_NAME}_LINK_SRC_FLAGS "${${PROJECT_NAME}_LINK_SRC_FLAGS} -ldl")
+  SET(${PROJECT_NAME}_LINK_FLAGS "${${PROJECT_NAME}_LINK_FLAGS} -ldl")
+ENDIF(UNIX)
+
+# Release flags
+IF(\"${CMAKE_BUILD_TYPE}\" STREQUAL \"\" )
+ELSE(\"${CMAKE_BUILD_TYPE}\" STREQUAL \"\" )
+  IF(${CMAKE_BUILD_TYPE} STREQUAL DEBUG)
+    SET(${PROJECT_NAME}_CXXFLAGS ${CMAKE_CXX_FLAGS_DEBUG}) # Useless since CXX_FLAGS, not CXXFLAGS.
+  ENDIF(${CMAKE_BUILD_TYPE} STREQUAL DEBUG)
+  IF(${CMAKE_BUILD_TYPE} STREQUAL RELEASE)
+    SET(${PROJECT_NAME}_CXXFLAGS ${CMAKE_CXX_FLAGS_RELEASE}) # Same here.
+  ENDIF(${CMAKE_BUILD_TYPE} STREQUAL RELEASE)
+ENDIF (\"${CMAKE_BUILD_TYPE}\" STREQUAL \"\")
+
+# --- Default options -------------------------------------------------
+OPTION(BUILD_SHARED_LIBS "Build ${PROJECT_NAME} with shared libraries." ON)
+OPTION(GENERATE_DOC "Generate html documentation" OFF)
+
+OPTION(USE_BOOST "Compile with boost." ON)
+OPTION(USE_DYNAMICS_JRL_JAPAN "Compile with dynamicsJRLJapan" ON)
+
+# Release/Debug
+#SET(CMAKE_BUILD_TYPE RELEASE)
+#SET(CMAKE_BUILD_TYPE DEBUG)
+
 #
 # Look for dependencies
 #
@@ -157,8 +196,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
-#ADD_SUBDIRECTORY(unitTesting)
-
 #
 # Documentation produced by doxygen
 #
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0b5bc44ddbf6c1f629144390f7142d9aefc0e5c..3c3a38ffad64895a9d8485ee85b5e33a391ee930 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(libdg_templates "")
 SET(libdg_plugins "")
 SET(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-SET(LIBRARY_NAME dgraph)
+SET(LIBRARY_NAME dynamicGraph)
 
 #ordre est important
 INCLUDE_DIRECTORIES(