From: ageay <ageay>
Date: Fri, 4 Oct 2013 07:44:55 +0000 (+0000)
Subject: bin directory no more useful.
X-Git-Tag: V7_3_0a1~115
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0214872f0726868de9213d3e965356714bb66262;p=modules%2Fmed.git

bin directory no more useful.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9472f9ae..ae5cf152f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,13 +99,12 @@ IF(NOT SALOME_MED_STANDALONE)
   ENDIF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
   FIND_PACKAGE(SalomeOmniORB REQUIRED)
+  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 ELSE(NOT SALOME_MED_STANDALONE)
   LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local_without_kernel/cmake_files")
   INCLUDE(SalomeMacros)
 ENDIF(NOT SALOME_MED_STANDALONE)
 
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
-
 # Platform setup
 # ==============
 INCLUDE(SalomeSetupPlatform)
@@ -234,6 +233,8 @@ SET(output ${PROJECT_BINARY_DIR}/MED_version.h)
 MESSAGE(STATUS "Creation of ${output}")
 CONFIGURE_FILE(${input} ${output} @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MED_version.h DESTINATION ${SALOME_INSTALL_HEADERS})
+CONFIGURE_FILE(VERSION.in VERSION @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION ${SALOME_INSTALL_BINS})
 
 # Sources 
 # ========
diff --git a/VERSION.in b/VERSION.in
new file mode 100755
index 000000000..bbf8f49d9
--- /dev/null
+++ b/VERSION.in
@@ -0,0 +1,3 @@
+[SALOME MED]  : @VERSION@
+[DEVELOPMENT] : @VERSION_DEV@
+[DESCRIPTION] : SALOME Med module
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
deleted file mode 100644
index a90e82b5c..000000000
--- a/bin/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
-#
-# 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.
-#
-# 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
-#
-
-CONFIGURE_FILE(VERSION.in VERSION @ONLY)
-
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION ${SALOME_INSTALL_BINS})
diff --git a/bin/VERSION.in b/bin/VERSION.in
deleted file mode 100755
index bbf8f49d9..000000000
--- a/bin/VERSION.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[SALOME MED]  : @VERSION@
-[DEVELOPMENT] : @VERSION_DEV@
-[DESCRIPTION] : SALOME Med module