diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75b85583a8f59d44d8af4066641218335d32b4d0..abcdc346e6248bf58f047cf4ebdb5cd57b68bd9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ ENDIF(APPLE)
 
 # {{{ C++ and Python client.
 # Dependencies
+FINDPYTHON()
 ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
 
 SET(${PROJECT_NAME}_HEADERS
@@ -53,7 +54,6 @@ SET(${PROJECT_NAME}_HEADERS
 # {{{ C++ server.
 IF(NOT CLIENT_ONLY)
   # {{{ Dependencies for the server.
-  FINDPYTHON()
 
   # Tells pkg-config to read qtversion and cmake_plugin from pkg config file.
   LIST(APPEND PKG_CONFIG_ADDITIONAL_VARIABLES qtversion cmake_plugin)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d637123cb4b9d3c6d15859ab486a09ab7defeb5..e21981fd7e05a7e96f17182dd419d703db131741 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,7 +118,9 @@ ENDIF(NOT CLIENT_ONLY)
 ADD_LIBRARY(${LIBRARY_NAME} SHARED ${${PROJECT_NAME}_SOURCES})
 ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
 ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
-PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} gepetto-viewer)
+IF(NOT CLIENT_ONLY)
+  PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} gepetto-viewer)
+ENDIF(NOT CLIENT_ONLY)
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4)
 
 INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)