From 66780cef0655cb3cfcc299787f0918ee47a44526 Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 1 Nov 2013 10:01:27 +0000 Subject: [PATCH] Compilation on Windows --- Demo/CMakeLists.txt | 4 ++-- adm/cmake/FindExpat.cmake | 3 ++- adm/cmake/FindGraphviz.cmake | 4 ++-- idl/CMakeLists.txt | 5 ++--- src/bases/CMakeLists.txt | 14 +++++++++++++- src/bases/DynLibLoader.cxx | 2 +- src/bases/DynLibLoader.hxx | 4 ++-- src/bases/ThreadPT.cxx | 2 +- src/bases/YACSBasesExport.hxx | 2 +- src/bases/YacsTrace.cxx | 2 +- src/engine/CMakeLists.txt | 3 +++ src/engine/Executor.cxx | 2 +- src/engine/Plugin/aleas.cxx | 2 +- src/engine/YACSlibEngineExport.hxx | 4 ++-- src/engine_swig/CMakeLists.txt | 13 +++++++++++-- src/genericgui/CMakeLists.txt | 3 +++ src/genericgui/GenericGui.cxx | 6 +++--- src/genericgui/GenericGuiExport.hxx | 2 +- src/genericgui/GuiExecutor.cxx | 2 +- src/genericgui/SceneLinkItem.hxx | 2 +- src/hmi/CMakeLists.txt | 3 +++ src/hmi/HMIExport.hxx | 2 +- src/runtime/CMakeLists.txt | 3 +++ src/runtime/CppContainer.cxx | 16 ++++++++-------- src/runtime/CppContainer.hxx | 6 +++--- src/runtime/PythonNode.cxx | 2 +- src/runtime/SalomeContainer.cxx | 2 +- src/runtime/TypeConversions.cxx | 2 +- src/runtime/XMLNode.cxx | 4 ++-- src/runtime/YACSRuntimeSALOMEExport.hxx | 2 +- src/runtime_swig/CMakeLists.txt | 7 +++++-- src/salomegui/CMakeLists.txt | 3 +++ src/salomegui/YACSExport.hxx | 2 +- src/salomegui_swig/CMakeLists.txt | 4 ++-- src/salomewrap/SalomeWrapExport.hxx | 2 +- src/yacsloader/CMakeLists.txt | 3 +++ src/yacsloader/Test/YacsLoaderTest.cxx | 2 +- src/yacsloader/Test/echoSrv.cxx | 2 +- src/yacsloader/YACSloaderExport.hxx | 2 +- src/yacsloader/driver.cxx | 16 ++++++++-------- src/yacsloader_swig/CMakeLists.txt | 7 +++++-- 41 files changed, 109 insertions(+), 64 deletions(-) diff --git a/Demo/CMakeLists.txt b/Demo/CMakeLists.txt index 2e507d456..abce129ee 100644 --- a/Demo/CMakeLists.txt +++ b/Demo/CMakeLists.txt @@ -27,9 +27,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) -IF(WINDOWS) +IF(WIN32) ADD_DEFINITIONS(-DNOGDI) -ENDIF(WINDOWS) +ENDIF(WIN32) SET(echo_IDLSOURCES echo.idl diff --git a/adm/cmake/FindExpat.cmake b/adm/cmake/FindExpat.cmake index 253656b06..ffad267b6 100644 --- a/adm/cmake/FindExpat.cmake +++ b/adm/cmake/FindExpat.cmake @@ -17,7 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -FIND_LIBRARY(EXPAT_LIBRARIES expat libexpat) +FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat) + FIND_PATH(EXPAT_INCLUDE_DIR expat.h) # Handle the standard arguments of the find_package() command: diff --git a/adm/cmake/FindGraphviz.cmake b/adm/cmake/FindGraphviz.cmake index 6eb1e5a71..d9647e88c 100644 --- a/adm/cmake/FindGraphviz.cmake +++ b/adm/cmake/FindGraphviz.cmake @@ -35,14 +35,14 @@ FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h) SET(GRAPHVIZ_INCLUDE_DIRS ${GRAPHVIZ_INCLUDE_DIR} ${GRAPHVIZ_INCLUDE_DIR}/graphviz) FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY NAMES cdt PATH_SUFFIXES bin) -FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY NAMES cgraph PATH_SUFFIXES bin) +#FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY NAMES cgraph PATH_SUFFIXES bin) FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY NAMES graph PATH_SUFFIXES bin) FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY NAMES gvc PATH_SUFFIXES bin) FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan PATH_SUFFIXES bin) SET(GRAPHVIZ_LIBRARIES ${GRAPHVIZ_cdt_LIBRARY} - ${GRAPHVIZ_cgraph_LIBRARY} +# ${GRAPHVIZ_cgraph_LIBRARY} ${GRAPHVIZ_graph_LIBRARY} ${GRAPHVIZ_gvc_LIBRARY} ${GRAPHVIZ_pathplan_LIBRARY} diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index ccf13f73c..f8eaf6077 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -29,10 +29,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) -IF(WINDOWS) +IF(WIN32) ADD_DEFINITIONS(-DNOGDI) -ENDIF(WINDOWS) - +ENDIF(WIN32) SET(SalomeIDLYACS_IDLSOURCES yacsgui.idl diff --git a/src/bases/CMakeLists.txt b/src/bases/CMakeLists.txt index 51e0f8480..be7801afe 100644 --- a/src/bases/CMakeLists.txt +++ b/src/bases/CMakeLists.txt @@ -32,6 +32,9 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( "-DYACS_PTHREAD" ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES @@ -76,9 +79,18 @@ SET(YACSBases_SOURCES chrono.cxx ) +# --- type of library --- + +SET(TYPE) +IF(WIN32) + SET(TYPE STATIC) +ELSE(WIN32) + SET(TYPE SHARED) +ENDIF(WIN32) + # --- rules --- -ADD_LIBRARY(YACSBases ${YACSBases_SOURCES}) +ADD_LIBRARY(YACSBases ${TYPE} ${YACSBases_SOURCES}) TARGET_LINK_LIBRARIES(YACSBases ${_link_LIBRARIES}) INSTALL(TARGETS YACSBases EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/bases/DynLibLoader.cxx b/src/bases/DynLibLoader.cxx index 9818da19b..00ff02dca 100644 --- a/src/bases/DynLibLoader.cxx +++ b/src/bases/DynLibLoader.cxx @@ -20,7 +20,7 @@ #include "DynLibLoader.hxx" #if defined(YACS_PTHREAD) -#if defined(WNT) +#if defined(WIN32) #include "DynLibLoaderWin.cxx" #else #include "DynLibLoaderGNU.cxx" diff --git a/src/bases/DynLibLoader.hxx b/src/bases/DynLibLoader.hxx index 74d9efb3a..56067a17f 100644 --- a/src/bases/DynLibLoader.hxx +++ b/src/bases/DynLibLoader.hxx @@ -40,7 +40,7 @@ #if defined(YACS_PTHREAD) -#if defined(WNT) +#if defined(WIN32) #include "DynLibLoaderWin.hxx" #else #include "DynLibLoaderGNU.hxx" @@ -50,7 +50,7 @@ namespace YACS { namespace BASES { -#if defined(WNT) +#if defined(WIN32) typedef DynLibLoaderWin DynLibLoader; #else typedef DynLibLoaderGNU DynLibLoader; diff --git a/src/bases/ThreadPT.cxx b/src/bases/ThreadPT.cxx index b5fd07cec..50f6e9a65 100644 --- a/src/bases/ThreadPT.cxx +++ b/src/bases/ThreadPT.cxx @@ -19,7 +19,7 @@ #include "ThreadPT.hxx" #include "Exception.hxx" -#ifdef WNT +#ifdef WIN32 #include #define usleep(A) Sleep(A/1000) #else diff --git a/src/bases/YACSBasesExport.hxx b/src/bases/YACSBasesExport.hxx index c8d911893..bda6b44be 100644 --- a/src/bases/YACSBasesExport.hxx +++ b/src/bases/YACSBasesExport.hxx @@ -20,7 +20,7 @@ #ifndef _YACSBASESEXPORT_HXX_ #define _YACSBASESEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 // # if defined YACSBases_EXPORTS // # define YACSBASES_EXPORT __declspec( dllexport ) // # else diff --git a/src/bases/YacsTrace.cxx b/src/bases/YacsTrace.cxx index 8b84b625a..17048749e 100644 --- a/src/bases/YacsTrace.cxx +++ b/src/bases/YacsTrace.cxx @@ -22,7 +22,7 @@ #include "YacsTrace.hxx" #include -#ifdef WNT +#ifdef WIN32 #include #define getpid _getpid #else diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 5b8fa5853..2b21a6475 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -33,6 +33,9 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS( -DYACS_PTHREAD ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES diff --git a/src/engine/Executor.cxx b/src/engine/Executor.cxx index 2893dd3e9..6415777d8 100644 --- a/src/engine/Executor.cxx +++ b/src/engine/Executor.cxx @@ -38,7 +38,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #define usleep(A) _sleep(A/1000) #if !defined(S_ISCHR) || !defined(S_ISREG) # ifndef S_IFMT diff --git a/src/engine/Plugin/aleas.cxx b/src/engine/Plugin/aleas.cxx index c6cefb3ca..cbd5fd9ec 100644 --- a/src/engine/Plugin/aleas.cxx +++ b/src/engine/Plugin/aleas.cxx @@ -19,7 +19,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #else #include #endif diff --git a/src/engine/YACSlibEngineExport.hxx b/src/engine/YACSlibEngineExport.hxx index bb7f9626b..0248ccd90 100644 --- a/src/engine/YACSlibEngineExport.hxx +++ b/src/engine/YACSlibEngineExport.hxx @@ -20,7 +20,7 @@ #ifndef _YACSLIBENGINEEXPORT_HXX_ #define _YACSLIBENGINEEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined YACSlibEngine_EXPORTS # define YACSLIBENGINE_EXPORT __declspec( dllexport ) # else @@ -30,7 +30,7 @@ # define YACSLIBENGINE_EXPORT #endif -#ifdef WNT +#ifdef WIN32 #pragma warning(disable:4251) // Warning DLL Interface ... #pragma warning(disable:4290) // Warning Exception ... #endif diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt index c6a79766f..25264b775 100644 --- a/src/engine_swig/CMakeLists.txt +++ b/src/engine_swig/CMakeLists.txt @@ -21,6 +21,12 @@ INCLUDE(${SWIG_USE_FILE}) # --- options --- +IF(WIN32) # if platform is Windows 64 bit + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + ADD_DEFINITIONS(/bigobj) # to avoid error C1128 + ENDIF() +EINDIF() + # additional include directories INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} @@ -47,6 +53,9 @@ ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} -DYACS_PTHREAD ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES @@ -158,10 +167,10 @@ ADD_DEPENDENCIES(_pypilot pypilot.i pilot.i engtypemaps.i _pilot ${SWIGINCLUDES} SWIG_LINK_LIBRARIES(pilot "${_link_LIBRARIES}") SWIG_LINK_LIBRARIES(pypilot "${_link_LIBRARIES}") -IF(WINDOWS) +IF(WIN32) SET_TARGET_PROPERTIES(_pilot PROPERTIES DEBUG_OUTPUT_NAME _pilot_d) SET_TARGET_PROPERTIES(_pypilot PROPERTIES DEBUG_OUTPUT_NAME _pypilot_d) -ENDIF(WINDOWS) +ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_pilot_REAL_NAME} ${SWIG_MODULE_pypilot_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON}) diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt index 60578baa2..0d843eb99 100644 --- a/src/genericgui/CMakeLists.txt +++ b/src/genericgui/CMakeLists.txt @@ -53,6 +53,9 @@ ADD_DEFINITIONS( ${KERNEL_DEFINITIONS} ${GUI_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx index a6bbb2040..2b49c3504 100644 --- a/src/genericgui/GenericGui.cxx +++ b/src/genericgui/GenericGui.cxx @@ -67,7 +67,7 @@ #include -#ifdef WNT +#ifdef WIN32 #define WEXITSTATUS(w) ((int) ((w) & 0x40000000)) #endif @@ -1369,7 +1369,7 @@ void GenericGui::onImportSupervSchema() QString tmpFileName; try { -#ifdef WNT +#ifdef WIN32 QString tmpDir = getenv("TEMP"); QString fileExt = "bat"; #else @@ -1615,7 +1615,7 @@ void GenericGui::onRunLoadedSchema(bool withState) QFileInfo fo = QtGuiContext::getQtCurrent()->getFileName(); QString procName = fo.baseName(); //QString tmpDir = SALOMEDS_Tool::GetTmpDir().c_str(); -#ifdef WNT +#ifdef WIN32 QString tmpDir = getenv("TEMP"); #else QString tmpDir = "/tmp"; diff --git a/src/genericgui/GenericGuiExport.hxx b/src/genericgui/GenericGuiExport.hxx index 4f75195f6..7516af8fc 100644 --- a/src/genericgui/GenericGuiExport.hxx +++ b/src/genericgui/GenericGuiExport.hxx @@ -20,7 +20,7 @@ #ifndef _GENERICGUIEXPORT_HXX_ #define _GENERICGUIEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined GenericGui_EXPORTS # define GENERICGUI_EXPORT __declspec( dllexport ) # else diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx index e478851b8..0b857e80f 100644 --- a/src/genericgui/GuiExecutor.cxx +++ b/src/genericgui/GuiExecutor.cxx @@ -253,7 +253,7 @@ void GuiExecutor::setStopOnError(bool aMode) DEBTRACE("GuiExecutor::setStopOnError " << aMode); if (_isRunning) { -#ifdef WNT +#ifdef WIN32 _procRef->setStopOnError(aMode, (getenv("TEMP") + string("\\dumpStateOnError_") + getenv("USER") + string(".xml")).c_str()); #else _procRef->setStopOnError(aMode, (string("/tmp/dumpStateOnError_") + getenv("USER") + string(".xml")).c_str()); diff --git a/src/genericgui/SceneLinkItem.hxx b/src/genericgui/SceneLinkItem.hxx index 428a11382..e4ad67837 100644 --- a/src/genericgui/SceneLinkItem.hxx +++ b/src/genericgui/SceneLinkItem.hxx @@ -27,7 +27,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #ifdef _UP #undef _UP #endif diff --git a/src/hmi/CMakeLists.txt b/src/hmi/CMakeLists.txt index 0851f15ea..440cfb2ea 100644 --- a/src/hmi/CMakeLists.txt +++ b/src/hmi/CMakeLists.txt @@ -43,6 +43,9 @@ ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES diff --git a/src/hmi/HMIExport.hxx b/src/hmi/HMIExport.hxx index e3cbb9eba..1a40ee2cf 100644 --- a/src/hmi/HMIExport.hxx +++ b/src/hmi/HMIExport.hxx @@ -20,7 +20,7 @@ #ifndef _HMIEXPORT_HXX_ #define _HMIEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined HMI_EXPORTS # define HMI_EXPORT __declspec( dllexport ) # else diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt index 788f5dc3d..3946aac89 100644 --- a/src/runtime/CMakeLists.txt +++ b/src/runtime/CMakeLists.txt @@ -67,6 +67,9 @@ ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES diff --git a/src/runtime/CppContainer.cxx b/src/runtime/CppContainer.cxx index f2183266d..eb374f01c 100644 --- a/src/runtime/CppContainer.cxx +++ b/src/runtime/CppContainer.cxx @@ -19,7 +19,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #define dlopen LoadLibrary #define dlclose FreeLibrary @@ -308,7 +308,7 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName } } -#ifndef WNT +#ifndef WIN32 std::string impl_name = std::string ("lib") + aCompName + std::string("Local.so"); if(sprefix != "") impl_name = sprefix + std::string("/") + impl_name; @@ -318,7 +318,7 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName #endif DEBTRACE("impl_name = " << impl_name); -#if defined( WNT ) +#if defined( WIN32 ) HMODULE handle; handle = dlopen( impl_name.c_str() ) ; #else @@ -327,11 +327,11 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName #endif const char * sError; -#if defined( WNT ) +#if defined( WIN32 ) sError = "Not available here !"; #endif -#if defined( WNT ) +#if defined( WIN32 ) if (!handle) #else sError = dlerror(); @@ -348,7 +348,7 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName void *ihandle, *rhandle, *phandle = NULL, *thandle = NULL; ihandle = dlsym(handle, "__init"); -#if defined( WNT ) +#if defined( WIN32 ) if (!ihandle) #else if (sError = dlerror()) @@ -363,7 +363,7 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName } rhandle = dlsym(handle, "__run"); -#if defined( WNT ) +#if defined( WIN32 ) if (!rhandle) #else if (sError = dlerror()) @@ -378,7 +378,7 @@ LocalLibrary LocalContainer::loadComponentLibrary(const std::string & aCompName } thandle = dlsym(handle, "__terminate"); -#if defined( WNT ) +#if defined( WIN32 ) if (!thandle) #else if (sError = dlerror()) diff --git a/src/runtime/CppContainer.hxx b/src/runtime/CppContainer.hxx index 142e30f52..271014714 100644 --- a/src/runtime/CppContainer.hxx +++ b/src/runtime/CppContainer.hxx @@ -26,7 +26,7 @@ #include "Container.hxx" #include "CppComponent.hxx" -#ifdef WNT +#ifdef WIN32 #include #endif @@ -37,7 +37,7 @@ namespace YACS struct LocalLibrary { -#if defined( WNT ) +#if defined( WIN32 ) HMODULE handle; #else void * handle; @@ -48,7 +48,7 @@ namespace YACS PingFunction pingHandle; TerminateFunction terminateHandle; -#if defined( WNT ) +#if defined( WIN32 ) LocalLibrary(HMODULE h, InitFunction i, RunFunction r, #else LocalLibrary(void *h, InitFunction i, RunFunction r, diff --git a/src/runtime/PythonNode.cxx b/src/runtime/PythonNode.cxx index a53106ddc..3dea3eefd 100644 --- a/src/runtime/PythonNode.cxx +++ b/src/runtime/PythonNode.cxx @@ -30,7 +30,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #define getpid _getpid #endif diff --git a/src/runtime/SalomeContainer.cxx b/src/runtime/SalomeContainer.cxx index 2d1583e27..849d3a604 100644 --- a/src/runtime/SalomeContainer.cxx +++ b/src/runtime/SalomeContainer.cxx @@ -40,7 +40,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #define getpid _getpid #endif diff --git a/src/runtime/TypeConversions.cxx b/src/runtime/TypeConversions.cxx index 9e6dddf98..c9b7ae208 100644 --- a/src/runtime/TypeConversions.cxx +++ b/src/runtime/TypeConversions.cxx @@ -37,7 +37,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #define _S_IREAD 256 #define _S_IWRITE 128 diff --git a/src/runtime/XMLNode.cxx b/src/runtime/XMLNode.cxx index 9e18f4c84..c3f15f58b 100644 --- a/src/runtime/XMLNode.cxx +++ b/src/runtime/XMLNode.cxx @@ -31,7 +31,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #include #define chmod _chmod @@ -92,7 +92,7 @@ void XmlNode::execute() char dir[]="yacsXXXXXX"; // add a lock around mkdtemp (seems not thread safe) MUTEX.lock(); -#ifdef WNT +#ifdef WIN32 char mdir [512+1]; GetTempPath(MAX_PATH+1, mdir); CreateDirectory(mdir, NULL); diff --git a/src/runtime/YACSRuntimeSALOMEExport.hxx b/src/runtime/YACSRuntimeSALOMEExport.hxx index 4d1b32f7e..4b742dca0 100644 --- a/src/runtime/YACSRuntimeSALOMEExport.hxx +++ b/src/runtime/YACSRuntimeSALOMEExport.hxx @@ -20,7 +20,7 @@ #ifndef _YACSRUNTIMESALOMEEXPORT_HXX_ #define _YACSRUNTIMESALOMEEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined YACSRuntimeSALOME_EXPORTS # define YACSRUNTIMESALOME_EXPORT __declspec( dllexport ) # else diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt index 57ab977ac..d16e18382 100644 --- a/src/runtime_swig/CMakeLists.txt +++ b/src/runtime_swig/CMakeLists.txt @@ -40,6 +40,9 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/engine_swig ${PROJECT_SOURCE_DIR}/src/runtime ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # swig flags SET_SOURCE_FILES_PROPERTIES(SALOMERuntime.i PROPERTIES @@ -98,9 +101,9 @@ ADD_DEPENDENCIES(_SALOMERuntime ${SWIGINCLUDES}) SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES}) -IF(WINDOWS) +IF(WIN32) SET_TARGET_PROPERTIES(_SALOMERuntime PROPERTIES DEBUG_OUTPUT_NAME _SALOMERuntime_d) -ENDIF(WINDOWS) +ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_SALOMERuntime_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON}) diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt index 16b1bcfdf..6991dde61 100644 --- a/src/salomegui/CMakeLists.txt +++ b/src/salomegui/CMakeLists.txt @@ -53,6 +53,9 @@ ADD_DEFINITIONS( ${QSCINTILLA_DEFINITIONS} ${GRAPHVIZ_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES diff --git a/src/salomegui/YACSExport.hxx b/src/salomegui/YACSExport.hxx index dfc2aa23a..131619552 100644 --- a/src/salomegui/YACSExport.hxx +++ b/src/salomegui/YACSExport.hxx @@ -20,7 +20,7 @@ #ifndef _YACSEXPORT_HXX_ #define _YACSEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined YACS_EXPORTS # define YACS_EXPORT __declspec( dllexport ) # else diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt index 3ee7b76db..a01551332 100644 --- a/src/salomegui_swig/CMakeLists.txt +++ b/src/salomegui_swig/CMakeLists.txt @@ -87,9 +87,9 @@ SWIG_ADD_MODULE(libYACS_Swig python libYACS_Swig.i YACSGUI_Swig.cxx) ADD_DEPENDENCIES(_libYACS_Swig libYACS_Swig.i doc.i YACSGUI_Swig.hxx) SWIG_LINK_LIBRARIES(libYACS_Swig "${_link_LIBRARIES}") -IF(WINDOWS) +IF(WIN32) SET_TARGET_PROPERTIES(_libYACS_Swig PROPERTIES DEBUG_OUTPUT_NAME _libYACS_Swig_d) -ENDIF(WINDOWS) +ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_libYACS_Swig_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON}) diff --git a/src/salomewrap/SalomeWrapExport.hxx b/src/salomewrap/SalomeWrapExport.hxx index 236a4289b..6bd11e38b 100644 --- a/src/salomewrap/SalomeWrapExport.hxx +++ b/src/salomewrap/SalomeWrapExport.hxx @@ -20,7 +20,7 @@ #ifndef _SALOMEWRAPEXPORT_HXX_ #define _SALOMEWRAPEXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined SalomeWrap_EXPORTS # define SALOMEWRAP_EXPORT __declspec( dllexport ) # else diff --git a/src/yacsloader/CMakeLists.txt b/src/yacsloader/CMakeLists.txt index 42d1f13c5..2a1cd1b05 100644 --- a/src/yacsloader/CMakeLists.txt +++ b/src/yacsloader/CMakeLists.txt @@ -66,6 +66,9 @@ ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) SET(_exec_DEFINITIONS -g ) diff --git a/src/yacsloader/Test/YacsLoaderTest.cxx b/src/yacsloader/Test/YacsLoaderTest.cxx index 36b391ba2..52b67b8c5 100644 --- a/src/yacsloader/Test/YacsLoaderTest.cxx +++ b/src/yacsloader/Test/YacsLoaderTest.cxx @@ -31,7 +31,7 @@ #include #include #include -#ifdef WNT +#ifdef WIN32 #include #define F_OK 0 #define access _access diff --git a/src/yacsloader/Test/echoSrv.cxx b/src/yacsloader/Test/echoSrv.cxx index d83a9ab20..57969ee0f 100644 --- a/src/yacsloader/Test/echoSrv.cxx +++ b/src/yacsloader/Test/echoSrv.cxx @@ -19,7 +19,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #define sleep _sleep #else diff --git a/src/yacsloader/YACSloaderExport.hxx b/src/yacsloader/YACSloaderExport.hxx index dd7705e0a..a533202b7 100644 --- a/src/yacsloader/YACSloaderExport.hxx +++ b/src/yacsloader/YACSloaderExport.hxx @@ -20,7 +20,7 @@ #ifndef _YACSLOADEREXPORT_HXX_ #define _YACSLOADEREXPORT_HXX_ -#ifdef WNT +#ifdef WIN32 # if defined YACSloader_EXPORTS # define YACSLOADER_EXPORT __declspec( dllexport ) # else diff --git a/src/yacsloader/driver.cxx b/src/yacsloader/driver.cxx index 0432d5e76..146fdda9a 100644 --- a/src/yacsloader/driver.cxx +++ b/src/yacsloader/driver.cxx @@ -40,7 +40,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #else #include #endif @@ -57,7 +57,7 @@ const char *argp_program_bug_address =""; static char doc[] ="driver -- a SALOME YACS graph executor"; static char args_doc[] = "graph.xml"; -#ifdef WNT +#ifdef WIN32 #else static struct argp_option options[] = { @@ -98,14 +98,14 @@ typedef struct { string lockFile; } thread_st; -#ifdef WNT +#ifdef WIN32 static int #else static error_t #endif parse_opt (int key, char *arg, struct argp_state *state) { -#ifdef WNT +#ifdef WIN32 #else // Get the input argument from argp_parse, which we // know is a pointer to our arguments structure. @@ -179,14 +179,14 @@ parse_opt (int key, char *arg, struct argp_state *state) } // Our argp parser. -#ifdef WNT +#ifdef WIN32 #else static struct argp argp = { options, parse_opt, args_doc, doc }; #endif void timer(std::string msg) { -#ifdef WNT +#ifdef WIN32 #else struct timeval tv; gettimeofday(&tv,NULL); @@ -289,7 +289,7 @@ int main (int argc, char* argv[]) myArgs.killPort = 0; // Parse our arguments; every option seen by parse_opt will be reflected in arguments. -#ifdef WNT +#ifdef WIN32 #else argp_parse (&argp, argc, argv, 0, 0, &myArgs); std::cerr << "graph = " << myArgs.args[0]; @@ -306,7 +306,7 @@ int main (int argc, char* argv[]) std::cerr << std::endl; #endif -#ifndef WNT +#ifndef WIN32 setsig(SIGINT,&Handler); setsig(SIGTERM,&Handler); #endif diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt index 1b76fc332..13c542cb4 100644 --- a/src/yacsloader_swig/CMakeLists.txt +++ b/src/yacsloader_swig/CMakeLists.txt @@ -50,6 +50,9 @@ ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES @@ -89,9 +92,9 @@ ADD_DEPENDENCIES(_loader ${SWIGINCLUDES}) SWIG_LINK_LIBRARIES(loader ${_link_LIBRARIES}) -IF(WINDOWS) +IF(WIN32) SET_TARGET_PROPERTIES(_loader PROPERTIES DEBUG_OUTPUT_NAME _loader_d) -ENDIF(WINDOWS) +ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_loader_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON}) -- 2.30.2