From 68d6726e155acccf11fd9fd96186fedef14b65a1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 19 Mar 2010 14:22:37 +0000 Subject: [PATCH] * All Tools: - Change: _SEARCH_PATH are put back into the *first* tool of a project. - Bug: In HURRICANE_CHECK_MACRO(), the quiet flag was not correctly implemented. User ARGV instead of argv (case sensitivity!). --- solstice/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt index ff8c57eb..f6b9eb90 100644 --- a/solstice/CMakeLists.txt +++ b/solstice/CMakeLists.txt @@ -10,21 +10,19 @@ ENDIF(COMMAND CMAKE_POLICY) MACRO(SETUP_PROJECT_PATHS project) IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}") - SET(${project}_DIR_SEARCH "$ENV{${project}_USER_TOP}") SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/") LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX) IF( DIR_INDEX LESS 0) - LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}") + LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}") ENDIF( DIR_INDEX LESS 0) ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) IF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}") - LIST(APPEND ${project}_DIR_SEARCH "$ENV{${project}_TOP}") - SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/") + SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/") LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX) IF( DIR_INDEX LESS 0) - LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}") + LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}") ENDIF( DIR_INDEX LESS 0) ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) ENDMACRO(SETUP_PROJECT_PATHS project)