Salome HOME
projects
/
plugins
/
netgenplugin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
688d92e
)
*** empty log message ***
author
adam
<adam>
Tue, 2 Mar 2010 15:52:36 +0000
(15:52 +0000)
committer
adam
<adam>
Tue, 2 Mar 2010 15:52:36 +0000
(15:52 +0000)
configure.ac
patch
|
blob
|
history
src/Makefile.am
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 490143050a0523e1c2a5248341e1bdb027b7a4ee..9c4dd108a4fbedfe3c4cefe6d7071d64f6a508a0 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-361,6
+361,7
@@
echo Summary
echo ---------------------------------------------
echo
+AM_CONDITIONAL(CMAKE_BUILD, 0)
#AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
echo Configure
diff --git
a/src/Makefile.am
b/src/Makefile.am
index cbd2d9ee89b2e598ee54031ef7f9f8476e9dd7e2..9c286800144bb6ec5b9e89499b87fc4070b5952f 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-28,9
+28,13
@@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS =
-if ! NETGEN_NEW
+if CMAKE_BUILD
+else
+if NETGEN_NEW
+else
SUBDIRS += NETGEN
endif
+endif
SUBDIRS += NETGENPlugin
if NETGENPLUGIN_ENABLE_GUI