From d565d46d639ac100aa512903efeeebce61795178 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Wed, 27 Jun 2012 11:31:22 +0200 Subject: [PATCH] fix CMakeList.txt to set CMAKE_MODULE_PATH correctly (plugins should do the same) --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d22b6a95..b172a855 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) -SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${CMAKE_MODULE_PATH}" ) -INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/PROJECTINFO.cmake" ) +INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" ) SET( BUILDTOOLS_DIR "buildtools/" ) @@ -12,10 +11,10 @@ ENDIF( NOT PREFIX ) IF( PLUGINNAME ) SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" ) ELSE( PLUGINNAME ) - SET( BUILDTOOLS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${BUILDTOOLS_DIR}" ) + SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" ) ENDIF( PLUGINNAME ) -SET( CMAKE_MODULE_PATH "${BUILDTOOLS_DIR}" "${CMAKE_MODULE_PATH}" ) +SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}" "${CMAKE_MODULE_PATH}" ) INCLUDE( LibyuiCommon ) INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" )