diff --git a/Seabreeze/src/CMakeLists.txt b/Seabreeze/src/CMakeLists.txt
index e5f063bf..8998ee8b 100644
--- a/Seabreeze/src/CMakeLists.txt
+++ b/Seabreeze/src/CMakeLists.txt
@@ -56,7 +56,7 @@
 
            add_library( Seabreeze     ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( Seabreeze     PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( Seabreeze     ${depLibs} )
+ target_link_libraries( Seabreeze     ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/anabatic/src/CMakeLists.txt b/anabatic/src/CMakeLists.txt
index fca8d790..01266311 100644
--- a/anabatic/src/CMakeLists.txt
+++ b/anabatic/src/CMakeLists.txt
@@ -95,7 +95,7 @@ endif ( CHECK_DETERMINISM )
 
            add_library( anabatic    ${cpps} )
  set_target_properties( anabatic    PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( anabatic    ${depLibs} )
+ target_link_libraries( anabatic    ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/bora/src/CMakeLists.txt b/bora/src/CMakeLists.txt
index 901ef0bf..36b86101 100644
--- a/bora/src/CMakeLists.txt
+++ b/bora/src/CMakeLists.txt
@@ -106,7 +106,7 @@
 
            add_library( bora         ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( bora         PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( bora         ${depLibs} )
+ target_link_libraries( bora         ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/crlcore/src/LibraryManager/CMakeLists.txt b/crlcore/src/LibraryManager/CMakeLists.txt
index a2cabb52..759e7d71 100644
--- a/crlcore/src/LibraryManager/CMakeLists.txt
+++ b/crlcore/src/LibraryManager/CMakeLists.txt
@@ -35,22 +35,22 @@
 				     
            add_library( libmanager   ${cpps} ${moccpps} )
  set_target_properties( libmanager   PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( libmanager   crlcore
-#                                    ${HURRICANE_PYTHON_LIBRARIES}
-#                                    ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                    ${HURRICANE_LIBRARIES}
-#                                    ${BOOKSHELF_LIBRARY}
-#                                    ${CONFIGURATION_LIBRARY}
-#                                    ${CIF_LIBRARY}
-#                                    ${AGDS_LIBRARY}
-#                                    ${UTILITIES_LIBRARY}
-#                                    ${LEFDEF_LIBRARIES}
-#                                    ${OA_LIBRARIES}
-#                                    ${QtX_LIBRARIES}
-#                                    ${Boost_LIBRARIES}
-#                                    ${LIBXML2_LIBRARIES}
-#                                    ${Python_LIBRARIES} -lutil
-#                     )
+ target_link_libraries( libmanager   crlcore
+                                     ${HURRICANE_PYTHON_LIBRARIES}
+                                     ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                     ${HURRICANE_LIBRARIES}
+                                     ${BOOKSHELF_LIBRARY}
+                                     ${CONFIGURATION_LIBRARY}
+                                     ${CIF_LIBRARY}
+                                     ${AGDS_LIBRARY}
+                                     ${UTILITIES_LIBRARY}
+                                     ${LEFDEF_LIBRARIES}
+                                     ${OA_LIBRARIES}
+                                     ${QtX_LIBRARIES}
+                                     ${Boost_LIBRARIES}
+                                     ${LIBXML2_LIBRARIES}
+                                     ${Python_LIBRARIES} -lutil
+                      )
 
                install( TARGETS      libmanager DESTINATION lib${LIB_SUFFIX} )
                install( FILES        ${includes} ${mocincludes} DESTINATION include/coriolis2/crlcore ) 
diff --git a/deprecated/katabatic/src/CMakeLists.txt b/deprecated/katabatic/src/CMakeLists.txt
index 47a35346..408499a8 100644
--- a/deprecated/katabatic/src/CMakeLists.txt
+++ b/deprecated/katabatic/src/CMakeLists.txt
@@ -78,7 +78,7 @@ endif ( CHECK_DETERMINISM )
 
            add_library( katabatic    ${cpps} )
  set_target_properties( katabatic    PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( katabatic    ${depLibs} )
+ target_link_libraries( katabatic    ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/deprecated/kite/src/CMakeLists.txt b/deprecated/kite/src/CMakeLists.txt
index 3d88d5a2..3e542381 100644
--- a/deprecated/kite/src/CMakeLists.txt
+++ b/deprecated/kite/src/CMakeLists.txt
@@ -100,7 +100,7 @@
 
            add_library( kite         ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( kite         PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( kite         ${depLibs} )
+ target_link_libraries( kite         ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/deprecated/knik/src/CMakeLists.txt b/deprecated/knik/src/CMakeLists.txt
index 50f9b738..041c7e29 100644
--- a/deprecated/knik/src/CMakeLists.txt
+++ b/deprecated/knik/src/CMakeLists.txt
@@ -45,23 +45,23 @@
 
            add_library ( knik          ${cpps} ${mocCpps} )
  set_target_properties ( knik          PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( knik          ${FLUTE_LIBRARY}
-#                                      ${CORIOLIS_LIBRARIES}
-#                                      ${HURRICANE_PYTHON_LIBRARIES}
-#                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                      ${HURRICANE_LIBRARIES}
-#                                      ${CONFIGURATION_LIBRARY}
-#                                      ${CIF_LIBRARY}
-#                                      ${AGDS_LIBRARY}
-#                                      ${UTILITIES_LIBRARY}
-#                                      ${FLUTE_LIBRARIES}
-#                                      ${LEFDEF_LIBRARIES}
-#                                      ${OA_LIBRARIES}
-#                                      ${QtX_LIBRARIES}
-#                                      ${Boost_LIBRARIES}
-#                                      ${LIBXML2_LIBRARIES}
-#                                      ${Python_LIBRARIES} -lutil
-#                      )	    
+ target_link_libraries ( knik          ${FLUTE_LIBRARY}
+                                       ${CORIOLIS_LIBRARIES}
+                                       ${HURRICANE_PYTHON_LIBRARIES}
+                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                       ${HURRICANE_LIBRARIES}
+                                       ${CONFIGURATION_LIBRARY}
+                                       ${CIF_LIBRARY}
+                                       ${AGDS_LIBRARY}
+                                       ${UTILITIES_LIBRARY}
+                                       ${FLUTE_LIBRARIES}
+                                       ${LEFDEF_LIBRARIES}
+                                       ${OA_LIBRARIES}
+                                       ${QtX_LIBRARIES}
+                                       ${Boost_LIBRARIES}
+                                       ${LIBXML2_LIBRARIES}
+                                       ${Python_LIBRARIES} -lutil
+                       )	    
 				    
                install ( TARGETS       knik DESTINATION lib${LIB_SUFFIX} )
                install ( FILES         ${includes}
diff --git a/deprecated/nimbus/src/CMakeLists.txt b/deprecated/nimbus/src/CMakeLists.txt
index 280bf983..a7d80acb 100644
--- a/deprecated/nimbus/src/CMakeLists.txt
+++ b/deprecated/nimbus/src/CMakeLists.txt
@@ -45,29 +45,29 @@
 
            add_library ( nimbus    ${cpps} ${pyCpps} )
  set_target_properties ( nimbus    PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( nimbus    ${CORIOLIS_LIBRARIES}  
-#                                  ${HURRICANE_PYTHON_LIBRARIES}
-#                                  ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                  ${HURRICANE_LIBRARIES}
-#                                  ${CONFIGURATION_LIBRARY}
-#                                  ${CIF_LIBRARY}
-#                                  ${AGDS_LIBRARY}
-#                                  ${LEFDEF_LIBRARIES}
-#                                  ${OA_LIBRARIES}
-#                                  ${QtX_LIBRARIES}
-#                                  ${Boost_LIBRARIES}
-#                                  ${LIBXML2_LIBRARIES}
-#                                  ${Python_LIBRARIES} -lutil
-#                      )
+ target_link_libraries ( nimbus    ${CORIOLIS_LIBRARIES}  
+                                   ${HURRICANE_PYTHON_LIBRARIES}
+                                   ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                   ${HURRICANE_LIBRARIES}
+                                   ${CONFIGURATION_LIBRARY}
+                                   ${CIF_LIBRARY}
+                                   ${AGDS_LIBRARY}
+                                   ${LEFDEF_LIBRARIES}
+                                   ${OA_LIBRARIES}
+                                   ${QtX_LIBRARIES}
+                                   ${Boost_LIBRARIES}
+                                   ${LIBXML2_LIBRARIES}
+                                   ${Python_LIBRARIES} -lutil
+                       )
 
            add_library ( pyNimbus  MODULE ${pyCpps} )
  set_target_properties ( pyNimbus  PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
                                               PREFIX        ""
                                               OUTPUT_NAME   "Nimbus"
                        )
-#target_link_libraries ( pyNimbus  nimbus 
-#                                  ${CORIOLIS_PYTHON_LIBRARIES}
-#                      )
+ target_link_libraries ( pyNimbus  nimbus 
+                                   ${CORIOLIS_PYTHON_LIBRARIES}
+                       )
 
                install ( TARGETS nimbus         DESTINATION lib${LIB_SUFFIX} )
                install ( TARGETS pyNimbus       DESTINATION ${PYTHON_SITE_PACKAGES} )
diff --git a/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt b/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt
index 0419802f..d357a111 100644
--- a/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt
+++ b/deprecated/vlsisapd/src/bookshelf/src/CMakeLists.txt
@@ -24,7 +24,7 @@
                        )            
                    set ( testcpps       BookshelfTkMain.cpp )
            add_library ( bookshelf      ${cpps} )
-#target_link_libraries ( bookshelf      vlsisapdutils )
+ target_link_libraries ( bookshelf      vlsisapdutils )
  set_target_properties ( bookshelf      PROPERTIES VERSION 1.0 SOVERSION 1 )
         add_executable ( bookshelf-tk   ${testcpps} )
  target_link_libraries ( bookshelf-tk   bookshelf ${Boost_LIBRARIES} ${Python_LIBRARIES})
diff --git a/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt b/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt
index 15b7d7f6..861d3382 100644
--- a/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt
+++ b/deprecated/vlsisapd/src/configuration/src/CMakeLists.txt
@@ -41,12 +41,12 @@
 				         
            add_library ( configuration   ${cpps} ${mocCpps} ${RCC_SRCS} )
  set_target_properties ( configuration   PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( configuration   vlsisapdutils
-#                                        ${QtX_LIBRARIES}
-#                                        ${Python_LIBRARIES}
-#                                        ${LIBXML2_LIBRARIES}
-#                                        ${Boost_LIBRARIES}
-#                      )
+ target_link_libraries ( configuration   vlsisapdutils
+                                         ${QtX_LIBRARIES}
+                                         ${Python_LIBRARIES}
+                                         ${LIBXML2_LIBRARIES}
+                                         ${Boost_LIBRARIES}
+                       )
 
  if (Boost_FOUND)
            add_library ( pyConfiguration MODULE ${pycpps})
@@ -54,11 +54,11 @@
                                          OUTPUT_NAME "Cfg"
                                          PREFIX      ""
                        )
-#target_link_libraries ( pyConfiguration configuration
-#                                        ${Python_LIBRARIES}
-#                                        ${LIBXML2_LIBRARIES}
-#                                        ${Boost_LIBRARIES}
-#                      )
+ target_link_libraries ( pyConfiguration configuration
+                                         ${Python_LIBRARIES}
+                                         ${LIBXML2_LIBRARIES}
+                                         ${Boost_LIBRARIES}
+                       )
                install ( TARGETS         pyConfiguration DESTINATION ${PYTHON_SITE_PACKAGES} )
  endif(Boost_FOUND)
 
diff --git a/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt b/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt
index b6ad7cb0..0a69f78e 100644
--- a/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt
+++ b/deprecated/vlsisapd/src/liberty/src/CMakeLists.txt
@@ -54,8 +54,8 @@ add_library ( liberty  ${cpps}
                        ${liberty_parser_cpps}
             )
 set_target_properties ( liberty PROPERTIES VERSION 1.0 SOVERSION 1)
-#target_link_libraries ( liberty ${Boost_LIBRARIES}
-#                      )
+ target_link_libraries ( liberty ${Boost_LIBRARIES}
+                       )
 
 install ( TARGETS  liberty DESTINATION lib${LIB_SUFFIX} )
 install ( FILES    ${includes} DESTINATION include/vlsisapd/liberty ) 
@@ -66,6 +66,6 @@ if ( Boost_FOUND )
                                       OUTPUT_NAME "LIBERTY"
                                       PREFIX      ""
                           )
-#   target_link_libraries ( pyLIBERTY liberty ${Boost_LIBRARIES} ${Python_LIBRARIES} )
+    target_link_libraries ( pyLIBERTY liberty ${Boost_LIBRARIES} ${Python_LIBRARIES} )
     install ( TARGETS pyLIBERTY DESTINATION ${PYTHON_SITE_PACKAGES} )
 endif ( Boost_FOUND )
diff --git a/equinox/src/CMakeLists.txt b/equinox/src/CMakeLists.txt
index d2f22a47..9f35f2f6 100644
--- a/equinox/src/CMakeLists.txt
+++ b/equinox/src/CMakeLists.txt
@@ -40,25 +40,25 @@
 
            add_library ( intervalTree   ${intervalTreeCpps} )
  set_target_properties ( intervalTree   PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( intervalTree   ${HURRICANE_LIBRARIES} )
+ target_link_libraries ( intervalTree   ${HURRICANE_LIBRARIES} )
 
            add_library ( equinox       ${cpps} ${mocCpps} )
  set_target_properties ( equinox       PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( equinox       intervalTree
-#                                      ${CORIOLIS_LIBRARIES}
-#                                      ${HURRICANE_PYTHON_LIBRARIES}
-#                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                      ${HURRICANE_LIBRARIES}
-#                                      ${CONFIGURATION_LIBRARY}
-#                                      ${CIF_LIBRARY}
-#                                      ${AGDS_LIBRARY}
-#                                      ${LEFDEF_LIBRARIES}
-#                                      ${OA_LIBRARIES}
-#                                      ${QtX_LIBRARIES}
-#                                      ${Boost_LIBRARIES}
-#                                      ${LIBXML2_LIBRARIES}
-#                                      ${Python_LIBRARIES} -lutil
-#                      )
+ target_link_libraries ( equinox       intervalTree
+                                       ${CORIOLIS_LIBRARIES}
+                                       ${HURRICANE_PYTHON_LIBRARIES}
+                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                       ${HURRICANE_LIBRARIES}
+                                       ${CONFIGURATION_LIBRARY}
+                                       ${CIF_LIBRARY}
+                                       ${AGDS_LIBRARY}
+                                       ${LEFDEF_LIBRARIES}
+                                       ${OA_LIBRARIES}
+                                       ${QtX_LIBRARIES}
+                                       ${Boost_LIBRARIES}
+                                       ${LIBXML2_LIBRARIES}
+                                       ${Python_LIBRARIES} -lutil
+                       )
 
                install ( TARGETS        equinox intervalTree DESTINATION lib${LIB_SUFFIX} )
                install ( FILES          ${includes}
diff --git a/etesian/src/CMakeLists.txt b/etesian/src/CMakeLists.txt
index 93693bc5..cde53f53 100644
--- a/etesian/src/CMakeLists.txt
+++ b/etesian/src/CMakeLists.txt
@@ -64,7 +64,7 @@
 
            add_library( etesian       ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( etesian       PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( etesian       ${depLibs} )
+ target_link_libraries( etesian       ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/hurricane/src/analog/CMakeLists.txt b/hurricane/src/analog/CMakeLists.txt
index ef454c26..3e738561 100644
--- a/hurricane/src/analog/CMakeLists.txt
+++ b/hurricane/src/analog/CMakeLists.txt
@@ -156,15 +156,15 @@
                       )
 
                    set( depLibs     viewer
-		                            isobar
-		                            hurricane
+	                            isobar
+	                            hurricane
                                     ${UTILITIES_LIBRARY}
                                     ${QtX_LIBRARIES}
                       )
 
            add_library( analog      ${cpps} ${pyCpps} )
  set_target_properties( analog      PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( analog      ${depLibs} )
+ target_link_libraries( analog      ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/katana/src/CMakeLists.txt b/katana/src/CMakeLists.txt
index a06284a0..b5a07e16 100644
--- a/katana/src/CMakeLists.txt
+++ b/katana/src/CMakeLists.txt
@@ -115,7 +115,7 @@
 
            add_library( katana       ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( katana       PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( katana       ${depLibs} )
+ target_link_libraries( katana       ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/mauka/src/CMakeLists.txt b/mauka/src/CMakeLists.txt
index 756c97d1..2b5c27d9 100644
--- a/mauka/src/CMakeLists.txt
+++ b/mauka/src/CMakeLists.txt
@@ -50,31 +50,31 @@
 
            add_library ( mauka         ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties ( mauka         PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( mauka         ${METIS_LIBRARIES}
-#                                      ${NIMBUS_LIBRARIES}
-#                                      ${CORIOLIS_LIBRARIES}
-#                                      ${HURRICANE_PYTHON_LIBRARIES}
-#                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                      ${HURRICANE_LIBRARIES}
-#                                      ${CONFIGURATION_LIBRARY}
-#                                      ${CIF_LIBRARY}
-#                                      ${AGDS_LIBRARY}
-#                                      ${LEFDEF_LIBRARIES}
-#                                      ${OA_LIBRARIES}
-#                                      ${QtX_LIBRARIES}
-#                                      ${Boost_LIBRARIES}
-#                                      ${LIBXML2_LIBRARIES}
-#                                      ${Python_LIBRARIES} -lutil
-#                      )
+ target_link_libraries ( mauka         ${METIS_LIBRARIES}
+                                       ${NIMBUS_LIBRARIES}
+                                       ${CORIOLIS_LIBRARIES}
+                                       ${HURRICANE_PYTHON_LIBRARIES}
+                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                       ${HURRICANE_LIBRARIES}
+                                       ${CONFIGURATION_LIBRARY}
+                                       ${CIF_LIBRARY}
+                                       ${AGDS_LIBRARY}
+                                       ${LEFDEF_LIBRARIES}
+                                       ${OA_LIBRARIES}
+                                       ${QtX_LIBRARIES}
+                                       ${Boost_LIBRARIES}
+                                       ${LIBXML2_LIBRARIES}
+                                       ${Python_LIBRARIES} -lutil
+                       )
 
            add_library ( pyMauka       MODULE ${pyCpps} )
  set_target_properties ( pyMauka       PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
                                                   PREFIX        ""
                                                   OUTPUT_NAME   "Mauka"
                        )
-#target_link_libraries ( pyMauka       mauka
-#                                      ${CORIOLIS_PYTHON_LIBRARIES}
-#                      )
+ target_link_libraries ( pyMauka       mauka
+                                       ${CORIOLIS_PYTHON_LIBRARIES}
+                       )
 
                install ( TARGETS       mauka           DESTINATION lib${LIB_SUFFIX} )
                install ( TARGETS       pyMauka         DESTINATION ${PYTHON_SITE_PACKAGES} )
diff --git a/metis/src/CMakeLists.txt b/metis/src/CMakeLists.txt
index 7b5ac96c..125c8bde 100644
--- a/metis/src/CMakeLists.txt
+++ b/metis/src/CMakeLists.txt
@@ -30,31 +30,31 @@ endif ( HMETIS_FOUND )
 
            add_library ( metis         ${cpps} ${pyCpps} )
  set_target_properties ( metis         PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( metis         ${HMETIS_LIBRARIES}
-#                                      ${NIMBUS_LIBRARIES}
-#                                      ${CORIOLIS_LIBRARIES}
-#                                      ${HURRICANE_PYTHON_LIBRARIES}
-#                                      ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                      ${HURRICANE_LIBRARIES}
-#                                      ${CONFIGURATION_LIBRARY}
-#                                      ${CIF_LIBRARY}
-#                                      ${AGDS_LIBRARY}
-#                                      ${LEFDEF_LIBRARIES}
-#                                      ${OA_LIBRARIES}
-#                                      ${QT_LIBRARIES}
-#                                      ${Boost_LIBRARIES}
-#                                      ${LIBXML2_LIBRARIES}
-#                                      ${Python_LIBRARIES} -lutil
-#                      )
+ target_link_libraries ( metis         ${HMETIS_LIBRARIES}
+                                       ${NIMBUS_LIBRARIES}
+                                       ${CORIOLIS_LIBRARIES}
+                                       ${HURRICANE_PYTHON_LIBRARIES}
+                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                       ${HURRICANE_LIBRARIES}
+                                       ${CONFIGURATION_LIBRARY}
+                                       ${CIF_LIBRARY}
+                                       ${AGDS_LIBRARY}
+                                       ${LEFDEF_LIBRARIES}
+                                       ${OA_LIBRARIES}
+                                       ${QT_LIBRARIES}
+                                       ${Boost_LIBRARIES}
+                                       ${LIBXML2_LIBRARIES}
+                                       ${Python_LIBRARIES} -lutil
+                       )
 
            add_library ( pyMetis       MODULE ${pyCpps} )
  set_target_properties ( pyMetis       PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
                                                   PREFIX        ""
                                                   OUTPUT_NAME   "Metis"
                        )
-#target_link_libraries ( pyMetis       metis 
-#                                      ${CORIOLIS_PYTHON_LIBRARIES}
-#                      )
+ target_link_libraries ( pyMetis       metis 
+                                       ${CORIOLIS_PYTHON_LIBRARIES}
+                       )
 
                install ( TARGETS       metis           DESTINATION lib${LIB_SUFFIX} )
                install ( TARGETS       pyMetis         DESTINATION ${PYTHON_SITE_PACKAGES} )
diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt
index dd041148..35b6c7ca 100644
--- a/solstice/src/CMakeLists.txt
+++ b/solstice/src/CMakeLists.txt
@@ -42,21 +42,21 @@
 
            add_library ( solstice       ${cpps} ${mocCpps} )
  set_target_properties ( solstice       PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries ( solstice       ${EQUINOX_LIBRARIES}
-#                                       ${CORIOLIS_LIBRARIES}
-#                                       ${HURRICANE_PYTHON_LIBRARIES}
-#                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
-#                                       ${HURRICANE_LIBRARIES}
-#                                       ${CONFIGURATION_LIBRARY}
-#                                       ${CIF_LIBRARY}
-#                                       ${AGDS_LIBRARY}
-#                                       ${LEFDEF_LIBRARIES}
-#                                       ${OA_LIBRARIES}
-#                                       ${QtX_LIBRARIES}
-#                                       ${Boost_LIBRARIES}
-#                                       ${LIBXML2_LIBRARIES}
-#                                       ${Python_LIBRARIES} -lutil
-#                      )
+ target_link_libraries ( solstice       ${EQUINOX_LIBRARIES}
+                                        ${CORIOLIS_LIBRARIES}
+                                        ${HURRICANE_PYTHON_LIBRARIES}
+                                        ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                        ${HURRICANE_LIBRARIES}
+                                        ${CONFIGURATION_LIBRARY}
+                                        ${CIF_LIBRARY}
+                                        ${AGDS_LIBRARY}
+                                        ${LEFDEF_LIBRARIES}
+                                        ${OA_LIBRARIES}
+                                        ${QtX_LIBRARIES}
+                                        ${Boost_LIBRARIES}
+                                        ${LIBXML2_LIBRARIES}
+                                        ${Python_LIBRARIES} -lutil
+                       )
 
                install ( TARGETS        solstice DESTINATION lib${LIB_SUFFIX} )
                install ( FILES          ${includes}
diff --git a/tutorial/src/CMakeLists.txt b/tutorial/src/CMakeLists.txt
index 5bb74cbd..8fdfae1e 100644
--- a/tutorial/src/CMakeLists.txt
+++ b/tutorial/src/CMakeLists.txt
@@ -46,7 +46,7 @@
 
            add_library( tutorial     ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( tutorial     PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( tutorial     ${depLibs} )
+ target_link_libraries( tutorial     ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index 6a7b563c..4562cf40 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -86,7 +86,7 @@
 
            add_library( unicorn       ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( unicorn       PROPERTIES VERSION 1.0 SOVERSION 1 )
-#target_link_libraries( unicorn       ${depLibs} )
+ target_link_libraries( unicorn       ${depLibs} )
 
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"