Fix compilation issues using CMake new procedure

diff --git a/salome_adm/cmake_files/FindCppUnit.cmake b/salome_adm/cmake_files/FindCppUnit.cmake
index e1264dec4f72dd8e6bedba74797a3131d9f45f84..f5d39a0c794ebc2ee90713aed9b3b515ef5eb27f 100644 (file)
--- a/salome_adm/cmake_files/FindCppUnit.cmake
+++ b/salome_adm/cmake_files/FindCppUnit.cmake
@@ -39,7 +39,7 @@ ENDIF()
 
 # Headers  
 SET(CPPUNIT_INCLUDE_TO_FIND cppunit/extensions/HelperMacros.h)
-FIND_PATH(CPPUNIT_INCLUDE_DIR ${CPPUNIT_INCLUDE_TO_FIND})
+FIND_PATH(CPPUNIT_INCLUDE_DIRS ${CPPUNIT_INCLUDE_TO_FIND})
 
 # Libraries
 IF(WINDOWS)
@@ -59,6 +59,6 @@ IF(WINDOWS)
 ENDIF(WINDOWS)
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CppUnit REQUIRED_VARS CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CppUnit REQUIRED_VARS CPPUNIT_INCLUDE_DIRS CPPUNIT_LIBRARIES)
 
 

diff --git a/salome_adm/cmake_files/FindOmniORB.cmake b/salome_adm/cmake_files/FindOmniORB.cmake
index 61754a913cb5388c9edf5d882b922fc1fc30ce20..e43909d2ee819877013cd497785675cdc2f88c86 100644 (file)
--- a/salome_adm/cmake_files/FindOmniORB.cmake
+++ b/salome_adm/cmake_files/FindOmniORB.cmake
@@ -107,7 +107,7 @@ IF(WIN32)
      NAMES python.py PATHS "/lib/python/omniidl_be" DOC ${_doc}) 
 ELSE()
   FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES python.py
+     NAMES __init__.py
      PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be" 
      DOC ${_doc})
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeBoost.cmake b/salome_adm/cmake_files/FindSalomeBoost.cmake
index fc191f91a0ec29c67979b500e4f01befd87dbe3d..c890566ea63c3d90c103afc60771584f99efbc49 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeBoost.cmake
+++ b/salome_adm/cmake_files/FindSalomeBoost.cmake
@@ -28,4 +28,7 @@ SET(Boost_USE_MULTITHREADED      ON )
 SET(Boost_USE_STATIC_RUNTIME     OFF)
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Boost Boost_INCLUDE_DIRS 1)
+IF(Boost_FOUND OR BOOST_FOUND)
+   MESSAGE(STATUS "Boost include dirs is: ${Boost_INCLUDE_DIRS}")
+ENDIF()   
 #MARK_AS_ADVANCED()

diff --git a/salome_adm/cmake_files/FindSalomeCppUnit.cmake b/salome_adm/cmake_files/FindSalomeCppUnit.cmake
index 81a903ee75a59adff54f325073a2d756f855aacb..fddffa31177acb30d349e6e112946f4dc7fa969d 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeCppUnit.cmake
+++ b/salome_adm/cmake_files/FindSalomeCppUnit.cmake
@@ -24,5 +24,5 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CppUnit CPPUNIT_INCLUDE_DIR 1)
-MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CppUnit CPPUNIT_INCLUDE_DIRS 1)
+MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIRS CPPUNIT_LIBRARIES)

diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake
index 88076852dbb1c6cccade959945816a9e4d4fc112..65e2d614aeb735f41494ff0c3bcb18ba43ba84b5 100755 (executable)
--- a/salome_adm/cmake_files/SalomeMacros.cmake
+++ b/salome_adm/cmake_files/SalomeMacros.cmake
@@ -300,6 +300,7 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
       # Override the variable - don't append to it, as it would give precedence
       # to what was stored there before!  
       SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
+      #MESSAGE("pkg ${pkg} / ${CMAKE_PREFIX_PATH}")
     ELSE()
       MESSAGE(STATUS "Found ${pkg} in CONFIG mode!")
     ENDIF()