Minor corrections

diff --git a/ACISPLUGIN_version.h.in b/ACISPLUGIN_version.h.in
deleted file mode 100644 (file)
index 3261ed1..0000000
--- a/ACISPLUGIN_version.h.in
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2014-2015  OPEN CASCADE
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#if !defined(__ACISPLUGIN_VERSION_H)
-#define __ACISPLUGIN_VERSION_H
-
-/*!
-  Specify version of SALOME ACISPLUGIN module, as follows
-
-  ACISPLUGIN_VERSION_MAJOR       : (integer) number identifying major version
-  ACISPLUGIN_VERSION_MINOR       : (integer) number identifying minor version
-  ACISPLUGIN_VERSION_MAINTENANCE : (integer) number identifying maintenance version
-  ACISPLUGIN_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
-  ACISPLUGIN_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
-  ACISPLUGIN_DEVELOPMENT         : (integer) indicates development version when set to 1
-*/
-
-#define ACISPLUGIN_VERSION_MAJOR       @SALOMEACISPLUGIN_MAJOR_VERSION@
-#define ACISPLUGIN_VERSION_MINOR       @SALOMEACISPLUGIN_MINOR_VERSION@
-#define ACISPLUGIN_VERSION_MAINTENANCE @SALOMEACISPLUGIN_PATCH_VERSION@
-#define ACISPLUGIN_VERSION_STR         "@SALOMEACISPLUGIN_VERSION@"
-#define ACISPLUGIN_VERSION             @SALOMEACISPLUGIN_XVERSION@
-#define ACISPLUGIN_DEVELOPMENT         @SALOMEACISPLUGIN_VERSION_DEV@
-
-#endif // __ACISPLUGIN_VERSION_H

diff --git a/ACISPlugin_version.h.in b/ACISPlugin_version.h.in
new file mode 100644 (file)
index 0000000..3261ed1
--- /dev/null
+++ b/ACISPlugin_version.h.in
@@ -0,0 +1,41 @@
+// Copyright (C) 2014-2015  OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#if !defined(__ACISPLUGIN_VERSION_H)
+#define __ACISPLUGIN_VERSION_H
+
+/*!
+  Specify version of SALOME ACISPLUGIN module, as follows
+
+  ACISPLUGIN_VERSION_MAJOR       : (integer) number identifying major version
+  ACISPLUGIN_VERSION_MINOR       : (integer) number identifying minor version
+  ACISPLUGIN_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+  ACISPLUGIN_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
+  ACISPLUGIN_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
+  ACISPLUGIN_DEVELOPMENT         : (integer) indicates development version when set to 1
+*/
+
+#define ACISPLUGIN_VERSION_MAJOR       @SALOMEACISPLUGIN_MAJOR_VERSION@
+#define ACISPLUGIN_VERSION_MINOR       @SALOMEACISPLUGIN_MINOR_VERSION@
+#define ACISPLUGIN_VERSION_MAINTENANCE @SALOMEACISPLUGIN_PATCH_VERSION@
+#define ACISPLUGIN_VERSION_STR         "@SALOMEACISPLUGIN_VERSION@"
+#define ACISPLUGIN_VERSION             @SALOMEACISPLUGIN_XVERSION@
+#define ACISPLUGIN_DEVELOPMENT         @SALOMEACISPLUGIN_VERSION_DEV@
+
+#endif // __ACISPLUGIN_VERSION_H

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38ad61ef5dc2b1061407db651edb285d748310b2..ae3fa6ac300db800cbbbb4bec0946505cf07fe66 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,7 +161,7 @@ ENDIF()
 # Header configuration
 # ====================
 SALOME_XVERSION(${PROJECT_NAME})
-SALOME_CONFIGURE_FILE(ACISPLUGIN_version.h.in ACISPLUGIN_version.h)
+SALOME_CONFIGURE_FILE(ACISPlugin_version.h.in ACISPlugin_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export
 # (here only the level 1 prerequisites are exposed)

diff --git a/src/ACISPlugin_IOperations_i.cc b/src/ACISPlugin_IOperations_i.cc
index 089636fbb088e0a2f019903017cae97e24682835..6af817c75ed2821d3297d67d325716809ec49070 100644 (file)
--- a/src/ACISPlugin_IOperations_i.cc
+++ b/src/ACISPlugin_IOperations_i.cc
@@ -20,7 +20,6 @@
 // internal includes
 #include "ACISPlugin_IOperations_i.hh"
 #include "ACISPlugin_IOperations.hxx"
-#include <ACISPLUGIN_version.h>
 
 // KERNEL includes
 #include <utilities.h>