From a2d05c9bb3494893c9b9052acdea923d105bb011 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 5 Dec 2013 14:12:22 +0000 Subject: [PATCH] Rename HexaBlockEngine library to the HexaBlockPluginEngine to avoid problems on windows. Problem occurs because HEXABLOCK module contains HEXABLOCKEngine library and HEXABLOCKPLUGIN module contains HexaBlockPluginEngine. But on windows HexaBlockEngine equal to the HEXABLOCKEngine. --- CMakeLists.txt | 4 ++-- SalomeHEXABLOCKPLUGINConfig.cmake.in | 6 +++--- adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 | 4 ++-- resources/HEXABLOCKPlugin.xml | 2 +- src/HEXABLOCKPlugin/CMakeLists.txt | 12 ++++++------ src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4d51b5..d1869b7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") # Specific to HEXABLOCKPLUGIN: -SET(SALOME_HEXABLOCKPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/HEXABLOCKplugin" CACHE PATH +SET(SALOME_HEXABLOCKPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hexablockplugin" CACHE PATH "Install path: SALOME HEXABLOCKPLUGIN specific data") MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) @@ -208,7 +208,7 @@ INCLUDE(CMakePackageConfigHelpers) # List of targets in this project we want to make visible to the rest of the world. # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" SET(_${PROJECT_NAME}_exposed_targets - HexaBlockEngine SalomeIDLHEXABLOCKPLUGIN + HexaBlockPluginEngine SalomeIDLHEXABLOCKPLUGIN ) IF(SALOME_BUILD_GUI) diff --git a/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in index 0bd9b7b..fb22406 100644 --- a/SalomeHEXABLOCKPLUGINConfig.cmake.in +++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in @@ -34,7 +34,7 @@ # Load the dependencies for the libraries of @PROJECT_NAME@ # (contains definitions for IMPORTED targets). This is only # imported if we are not built as a subproject (in this case targets are already there) -IF(NOT TARGET HexaBlockEngine AND NOT @PROJECT_NAME@_BINARY_DIR) +IF(NOT TARGET HexaBlockPluginEngine AND NOT @PROJECT_NAME@_BINARY_DIR) INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") ENDIF() @@ -115,11 +115,11 @@ IF(NOT (TARGET SMESHEngine)) ENDIF() # Include HEXABLOCK targets if they were not already loaded: -IF(NOT (TARGET HEXABLOCKEngine)) +IF(NOT (TARGET HexaBlockPluginEngine)) INCLUDE("${HEXABLOCK_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeHEXABLOCKTargets.cmake") ENDIF() # Exposed HEXABLOCKPLUGIN targets: -SET(HEXABLOCKPLUGIN_HexaBlockEngine HexaBlockEngine) +SET(HEXABLOCKPLUGIN_HexaBlockPluginEngine HexaBlockPluginEngine) SET(HEXABLOCKPLUGIN_HEXABLOCKPluginGUI HEXABLOCKPluginGUI) SET(HEXABLOCKPLUGIN_SalomeIDLHEXABLOCKPLUGIN SalomeIDLHEXABLOCKPLUGIN) \ No newline at end of file diff --git a/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 index f53b20b..a206930 100755 --- a/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HEXABLOCKPLUGIN.m4 @@ -47,7 +47,7 @@ if test "x$HEXABLOCKPLUGIN_DIR" = "x" ; then else # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libHexaBlockEngine.so) + AC_PATH_PROG(TEMP, libHexaBlockPluginEngine.so) if test "x$TEMP" != "x" ; then HEXABLOCKPLUGIN_DIR=`dirname $TEMP` fi @@ -56,7 +56,7 @@ if test "x$HEXABLOCKPLUGIN_DIR" = "x" ; then fi -if test -f ${HEXABLOCKPLUGIN_DIR}/lib/salome/libHexaBlockEngine.so ; then +if test -f ${HEXABLOCKPLUGIN_DIR}/lib/salome/libHexaBlockPluginEngine.so ; then HEXABLOCKPLUGIN_ok=yes AC_MSG_RESULT(Using HEXABLOCKPLUGIN module distribution in ${HEXABLOCKPLUGIN_DIR}) diff --git a/resources/HEXABLOCKPlugin.xml b/resources/HEXABLOCKPlugin.xml index 589ee2c..3215ef8 100755 --- a/resources/HEXABLOCKPlugin.xml +++ b/resources/HEXABLOCKPlugin.xml @@ -28,7 +28,7 @@ diff --git a/src/HEXABLOCKPlugin/CMakeLists.txt b/src/HEXABLOCKPlugin/CMakeLists.txt index 5cf8ed2..e024024 100644 --- a/src/HEXABLOCKPlugin/CMakeLists.txt +++ b/src/HEXABLOCKPlugin/CMakeLists.txt @@ -60,7 +60,7 @@ SET(_link_LIBRARIES # --- headers --- # header files -SET(HexaBlockEngine_HEADERS +SET(HexaBlockPluginEngine_HEADERS HEXABLOCKPlugin_Defs.hxx HEXABLOCKPlugin_HEXABLOCK.hxx HEXABLOCKPlugin_HEXABLOCK_i.hxx @@ -73,7 +73,7 @@ SET(HexaBlockEngine_HEADERS # --- sources --- # sources / static -SET(HexaBlockEngine_SOURCES +SET(HexaBlockPluginEngine_SOURCES HEXABLOCKPlugin_HEXABLOCK.cxx HEXABLOCKPlugin_HEXABLOCK_i.cxx HEXABLOCKPlugin_i.cxx @@ -85,8 +85,8 @@ SET(HexaBlockEngine_SOURCES # --- rules --- -ADD_LIBRARY(HexaBlockEngine ${HexaBlockEngine_SOURCES}) -TARGET_LINK_LIBRARIES(HexaBlockEngine ${_link_LIBRARIES} ) -INSTALL(TARGETS HexaBlockEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) +ADD_LIBRARY(HexaBlockPluginEngine ${HexaBlockPluginEngine_SOURCES}) +TARGET_LINK_LIBRARIES(HexaBlockPluginEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS HexaBlockPluginEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -INSTALL(FILES ${HexaBlockEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +INSTALL(FILES ${HexaBlockPluginEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx index ed0a8a4..19f8627 100755 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx @@ -25,7 +25,7 @@ #define _HEXABLOCKPlugin_DEFS_HXX_ #ifdef WIN32 - #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockEngine_EXPORTS + #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockPluginEngine_EXPORTS #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllexport ) #else #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllimport ) -- 2.39.2