diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt
index d41abbfb..ca321356 100644
--- a/hurricane/CMakeLists.txt
+++ b/hurricane/CMakeLists.txt
@@ -1,52 +1,37 @@
-PROJECT(HURRICANE)
 
-OPTION(BUILD_DOC "Build the documentation (doxygen)" OFF)
+ project(HURRICANE)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
+ option(BUILD_DOC "Build the documentation (doxygen)" OFF)
 
-MACRO(SETUP_PROJECT_PATHS project)
-  IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
-    MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_TOP}/share/cmake/Modules/")
-    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-  ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+ cmake_minimum_required(VERSION 2.4.0)
 
-  IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-    MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_USER_TOP}/share/cmake/Modules/")
-    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-  ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+ list(INSERT CMAKE_MODULE_PATH 0 "$ENV{BOOTSTRAP_TOP}/share/cmake/Modules")
+ find_package(Bootstrap REQUIRED)
+ setup_project_paths(BOOTSTRAP)
+ setup_project_paths(VLSISAPD)
+ list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
 
-  LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
-ENDMACRO(SETUP_PROJECT_PATHS project)
+ set_cmake_policies()
+ set_lib_link_mode()
+ setup_boost(regex filesystem)
 
-SETUP_PROJECT_PATHS(BOOTSTRAP)
-SETUP_PROJECT_PATHS(VLSISAPD)
-
-LIST(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
-
-find_package(Bootstrap REQUIRED)
-set_cmake_policies()
-set_lib_link_mode()
-setup_boost(regex filesystem)
-
-SET(QT_USE_QTXML "true")
-FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
-FIND_PACKAGE(BISON REQUIRED)
-FIND_PACKAGE(FLEX REQUIRED)
-FIND_PACKAGE(PythonLibs REQUIRED)
-FIND_PACKAGE(PythonSitePackages REQUIRED)
-FIND_PACKAGE(VLSISAPD REQUIRED)
-IF(BUILD_DOC)
-  FIND_PACKAGE(Doxygen)
-ENDIF(BUILD_DOC)
-
-ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(cmake_modules)
-ADD_SUBDIRECTORY(tests)
-IF(BUILD_DOC AND DOXYGEN_FOUND)
-  ADD_SUBDIRECTORY(doc)
-ENDIF(BUILD_DOC AND DOXYGEN_FOUND)
-
-ENABLE_TESTING()
-ADD_TEST(HurricaneTest ${PROJECT_BINARY_DIR}/tests/htest)
+ set(QT_USE_QTXML "true")
+ find_package(Qt4 REQUIRED)
+ find_package(BISON REQUIRED)
+ find_package(FLEX REQUIRED)
+ find_package(PythonLibs REQUIRED)
+ find_package(PythonSitePackages REQUIRED)
+ find_package(VLSISAPD REQUIRED)
+ if(BUILD_DOC)
+   find_package(Doxygen)
+ endif(BUILD_DOC)
+ 
+ add_subdirectory(src)
+ add_subdirectory(cmake_modules)
+ add_subdirectory(tests)
+ if(BUILD_DOC AND DOXYGEN_FOUND)
+   add_subdirectory(doc)
+ endif(BUILD_DOC AND DOXYGEN_FOUND)
+ 
+ enable_testing()
+ add_test(HurricaneTest ${PROJECT_BINARY_DIR}/tests/htest)