]> SALOME platform Git repositories - tools/adao_interface.git/commitdiff
Salome HOME
Remove useless dependency to py2cpp. master V9_6_0 V9_6_0a1 V9_6_0a2 V9_6_0b1 V9_6_0rc1 V9_7_0 V9_7_0b1 V9_7_0rc1 V9_7_0rc2
authorOvidiu Mircescu <ovidiu.mircescu@edf.fr>
Mon, 6 Jul 2020 10:36:47 +0000 (12:36 +0200)
committerOvidiu Mircescu <ovidiu.mircescu@edf.fr>
Mon, 6 Jul 2020 10:36:47 +0000 (12:36 +0200)
AdaoExchangeLayer.cxx
CMakeLists.txt

index c8c7c1703a18b8b4e7cbfdc7ae2cc1bcc2269542..4bc42dd0c24f2813da03752d4726d7efdc9b3864 100644 (file)
 #include "PyObjectRAII.hxx"
 #include "Python.h"
 
 #include "PyObjectRAII.hxx"
 #include "Python.h"
 
-#include "py2cpp/py2cpp.hxx"
-
 #include <semaphore.h>
 #include <semaphore.h>
-
 #include <iostream>
 #include <sstream>
 #include <clocale>
 #include <iostream>
 #include <sstream>
 #include <clocale>
index 8a076758eaba308db611d0dd3c0814be4849a472..bdb47de60c8699c028d095d67e168ed61497065b 100644 (file)
@@ -41,8 +41,6 @@ if(AEL_ENABLE_TESTS)
     set(PY2CPP_ROOT_DIR $ENV{PY2CPP_ROOT_DIR} CACHE PATH "Path to Py2cpp")
     set(Py2cpp_DIR "${PY2CPP_ROOT_DIR}/lib/cmake/py2cpp")
     find_package(Py2cpp REQUIRED)
     set(PY2CPP_ROOT_DIR $ENV{PY2CPP_ROOT_DIR} CACHE PATH "Path to Py2cpp")
     set(Py2cpp_DIR "${PY2CPP_ROOT_DIR}/lib/cmake/py2cpp")
     find_package(Py2cpp REQUIRED)
-    get_target_property(PY2CPP_INCLUDE_DIR py2cpp INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(PY2CPP_LIB py2cpp IMPORTED_LOCATION_RELEASE)
     find_package(SalomeCppUnit)
   else(EXISTS ${PY2CPP_ROOT_DIR})
     message(FATAL_ERROR "PY2CPP declared as enabled whereas not found !")
     find_package(SalomeCppUnit)
   else(EXISTS ${PY2CPP_ROOT_DIR})
     message(FATAL_ERROR "PY2CPP declared as enabled whereas not found !")
@@ -58,7 +56,6 @@ find_package(SalomePythonLibs REQUIRED)
 
 include_directories(
   ${PYTHON_INCLUDE_DIRS}
 
 include_directories(
   ${PYTHON_INCLUDE_DIRS}
-  ${PY2CPP_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
   )
 set(adaoexchange_SOURCES AdaoExchangeLayer.cxx AdaoModelKeyVal.cxx)
   ${CPPUNIT_INCLUDE_DIRS}
   )
 set(adaoexchange_SOURCES AdaoExchangeLayer.cxx AdaoModelKeyVal.cxx)
@@ -71,6 +68,6 @@ install(TARGETS adaoexchange DESTINATION lib)
 
 if(AEL_ENABLE_TESTS)
   add_executable(TestAdaoExchange TestAdaoExchange.cxx)
 
 if(AEL_ENABLE_TESTS)
   add_executable(TestAdaoExchange TestAdaoExchange.cxx)
-  target_link_libraries(TestAdaoExchange adaoexchange ${PY2CPP_LIB} ${CPPUNIT_LIBRARIES})
+  target_link_libraries(TestAdaoExchange adaoexchange py2cpp ${CPPUNIT_LIBRARIES})
   install(TARGETS TestAdaoExchange DESTINATION bin)
 endif(AEL_ENABLE_TESTS)
   install(TARGETS TestAdaoExchange DESTINATION bin)
 endif(AEL_ENABLE_TESTS)