From: nge Date: Wed, 19 Jun 2013 13:34:10 +0000 (+0000) Subject: Fix compilation issues using CMake new procedure X-Git-Tag: B4KillOfAutomake~43 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=307b3b7500069c726a81cd9fa2abd3e26c440f35;p=modules%2Fkernel.git Fix compilation issues using CMake new procedure --- diff --git a/salome_adm/cmake_files/FindCppUnit.cmake b/salome_adm/cmake_files/FindCppUnit.cmake index e1264dec4..f5d39a0c7 100644 --- 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 61754a913..e43909d2e 100644 --- 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 fc191f91a..c890566ea 100644 --- 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 81a903ee7..fddffa311 100644 --- 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 88076852d..65e2d614a 100755 --- 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()