From: Renaud Barate <renaud.barate@edf.fr>
Date: Thu, 11 Jul 2013 10:01:54 +0000 (+0200)
Subject: Adapt to new Salome CMake
X-Git-Tag: V7_3_0~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a75b1d3cf1449231d9c7dccdbed5adb17c992e89;p=modules%2Fparametric.git

Adapt to new Salome CMake
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b366dfc..d99bec1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,13 +33,13 @@ ENDIF(NOT GUI_ROOT_DIR)
 SET(CMAKE_MODULE_PATH ${KERNEL_ROOT_DIR}/salome_adm/cmake_files
                       ${GUI_ROOT_DIR}/adm_local/cmake_files)
 
-FIND_PACKAGE(SalomePYTHON)
-FIND_PACKAGE(OMNIORB)
-FIND_PACKAGE(SalomeSPHINX)
+INCLUDE(SalomeMacros)
+FIND_PACKAGE(SalomePython)
+FIND_PACKAGE(SalomeOmniORB)
+FIND_PACKAGE(SalomeOmniORBPy)
+FIND_PACKAGE(SalomeSphinx)
 FIND_PACKAGE(SalomeSIP)
-FIND_PACKAGE(SalomePYQT4)
-
-INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
+FIND_PACKAGE(SalomePyQt4)
 
 SET(BINDIR bin/salome)
 SET(RESDIR share/salome/resources/parametric)
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 5270124..1fe1fad 100644
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with SALOME PARAMETRIC module.  If not, see <http://www.gnu.org/licenses/>.
 
-INCLUDE(UseOMNIORB)
+INCLUDE(UseOmniORB)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}