Salome HOME
projects
/
modules
/
yacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdd5062
)
Synchronize adm files
author
salome-admin
<admin.salome@opencascade.com>
Wed, 16 Apr 2014 16:27:46 +0000
(20:27 +0400)
committer
salome-admin
<admin.salome@opencascade.com>
Wed, 16 Apr 2014 16:27:46 +0000
(20:27 +0400)
adm/cmake/SalomeMacros.cmake
patch
|
blob
|
history
diff --git
a/adm/cmake/SalomeMacros.cmake
b/adm/cmake/SalomeMacros.cmake
index 2c892693e2e21f28b4f14f2246bb0ad03171a3b2..8c85651f31fd1ada802d8544d171b3ad5eb9f237 100755
(executable)
--- a/
adm/cmake/SalomeMacros.cmake
+++ b/
adm/cmake/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)