Adapt to new Salome CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b366dfc376945b257839936d9c216b678810b0e6..d99bec1b78a247c4d72b399131f7c2d15944709d 100644 (file)
--- 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 52701242dc3a8c6fea42b97ea97c854f51eaad6a..1fe1fad991cb1aeb30c3983ba51ba73a0a5229af 100644 (file)
--- 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}