From aac5efd225470c73e84f8ca356a66a57378ca001 Mon Sep 17 00:00:00 2001 From: abn Date: Wed, 16 Apr 2014 09:38:43 +0200 Subject: [PATCH] Revert "CMake: fixed minor bug: when a _ROOT_DIR variable was set by the user after" This reverts commit f6f9c5 - the behavior is faulty with command line override and doesn't work properly with special cases like OMNIORBPY --- salome_adm/cmake_files/SalomeMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake index 2c892693e..8c85651f3 100644 --- a/salome_adm/cmake_files/SalomeMacros.cmake +++ b/salome_adm/cmake_files/SalomeMacros.cmake @@ -465,8 +465,8 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount) ELSE() SET(_var_already_there FALSE) ENDIF() - # Make cache entry, giving precedence to the env variable - SET(${pkg_UC}_ROOT_DIR "${_dflt_value}" CACHE PATH "Path to ${pkg_UC} directory" FORCE) + # Make cache entry + SET(${pkg_UC}_ROOT_DIR "${_dflt_value}" CACHE PATH "Path to ${pkg_UC} directory") ## ## 2. Find package - try CONFIG mode first (i.e. looking for XYZ-config.cmake) -- 2.39.2