diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffd682b3..9cb07ce6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,9 +45,7 @@ ExternalProject_Add(cmake
 	set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src")
 endif()
 
-if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
-	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x")
 	list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}")
 endif()
@@ -117,7 +115,6 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 		file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
 		list(APPEND CPPS ${ASRC})
 	endif()
-	#message("${NAME} HS = ${HS}")
 	list(APPEND HDRS ${HS})
 	list(APPEND PHDRS ${PHS})