build CHANGE move CMake's module searching for PCRE

Due to a collision with cmake's cclean target, move our cmake module searching for PCRE library into a better location (CMakeModules) and add an exception for this location into the cclean target
CESNET · Sep 1, 2015 · 977c1c8 · 977c1c8
1 parent 14f77e7
commit 977c1c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 
 # include custom Modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 
 # check the supported platform
 if(NOT UNIX)
@@ -85,7 +85,7 @@ configure_file(Doxyfile.in Doxyfile)
 # clean cmake cache
 add_custom_target(cclean
                   COMMAND make clean
-                  COMMAND find . -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} +
+                  COMMAND find . -iname '*cmake*' -not -name CMakeLists.txt -not -path './CMakeModules*' -exec rm -rf {} +
                   COMMAND rm -rf Makefile Doxyfile
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/cmake/Modules/FindPCRE.cmake → CMakeModules/FindPCRE.cmake b/cmake/Modules/FindPCRE.cmake → CMakeModules/FindPCRE.cmake