From ce7787586de9b89681c98fb4aa856caa29c2d40d Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Mon, 6 Jul 2020 12:36:47 +0200 Subject: [PATCH] Remove useless dependency to py2cpp. --- AdaoExchangeLayer.cxx | 3 --- CMakeLists.txt | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/AdaoExchangeLayer.cxx b/AdaoExchangeLayer.cxx index c8c7c17..4bc42dd 100644 --- a/AdaoExchangeLayer.cxx +++ b/AdaoExchangeLayer.cxx @@ -24,10 +24,7 @@ #include "PyObjectRAII.hxx" #include "Python.h" -#include "py2cpp/py2cpp.hxx" - #include - #include #include #include diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a07675..bdb47de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) - 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 !") @@ -58,7 +56,6 @@ find_package(SalomePythonLibs REQUIRED) include_directories( ${PYTHON_INCLUDE_DIRS} - ${PY2CPP_INCLUDE_DIR} ${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) - 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) -- 2.30.2