From: DUC ANH HOANG Date: Fri, 18 Oct 2024 14:10:57 +0000 (+0200) Subject: It's OK now X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fngo%2FWindows;p=modules%2Fhomard.git It's OK now --- diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt index b587d409..b47cbe12 100644 --- a/src/tool/CMakeLists.txt +++ b/src/tool/CMakeLists.txt @@ -27,7 +27,7 @@ SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_VERSION_MAJOR}.${${PROJECT_N # Fortran options #SET(CMAKE_Fortran_FLAGS "-ffixed-line-length-0 -fdefault-double-8 -fdefault-real-8 -fdefault-integer-8 -fimplicit-none") -SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp -i8") +SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp -i8 -ffixed-line-length-0 -fdefault-double-8 -fdefault-real-8 -fdefault-integer-8 /iface:mixed_str_len_arg ") # static libraries to build SET(_HT_libs @@ -51,6 +51,8 @@ IF (WIN32) ADD_DEFINITIONS(-Dextern_stdcall) ADD_DEFINITIONS(-D_DEBUG_HOMARD_) ADD_DEFINITIONS(-D_USE_64_BITS) + #ADD_DEFINITIONS(-DPPRO_NT) + ENDIF (WIN32) FUNCTION(HT_BUILD_LIBRARY dir) @@ -62,7 +64,7 @@ FUNCTION(HT_BUILD_LIBRARY dir) INCLUDE_DIRECTORIES(Includes_Generaux ${CMAKE_CURRENT_SOURCE_DIR}) ADD_LIBRARY (${dir}_f_lib STATIC ${_f_sources}) set_target_properties(${dir}_f_lib PROPERTIES LINKER_LANGUAGE Fortran) - set_target_properties(${dir}_f_lib PROPERTIES COMPILE_FLAGS "-i8" ) + set_target_properties(${dir}_f_lib PROPERTIES COMPILE_FLAGS " /c-ffixed-line-length-0 -fdefault-double-8 -fdefault-real-8 -fdefault-integer-8 -fpp -i8 /iface:mixed_str_len_arg " ) SET(TARGET_OBJECTS_LIST $ ) ENDIF() IF (_c_sources) @@ -87,5 +89,7 @@ SET(_link_LIBRARIES # Main executable ADD_EXECUTABLE(homard homard.f) +set_target_properties(homard PROPERTIES COMPILE_FLAGS " /c-ffixed-line-length-0 -fdefault-double-8 -fdefault-real-8 -fdefault-integer-8 -fpp -i8 /iface:mixed_str_len_arg " ) + TARGET_LINK_LIBRARIES(homard ${_HT_libs} ${_link_LIBRARIES}) INSTALL(TARGETS homard EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) diff --git a/src/tool/Dependance_Machine/dmmacc.c b/src/tool/Dependance_Machine/dmmacc.c index dfda05d5..70ed3320 100644 --- a/src/tool/Dependance_Machine/dmmacc.c +++ b/src/tool/Dependance_Machine/dmmacc.c @@ -43,7 +43,7 @@ void dmmacc_( char *nodeno, INTGR *nodelg, char *machno, INTGR *machlg, char *systno, INTGR *systlg, char *releno, INTGR *relelg, char *versno, INTGR *verslg, LNSTRF nodebi, LNSTRF machbi, LNSTRF systbi, LNSTRF relebi, LNSTRF versbi ) #else #ifdef extern_stdcall -extern void __stdcall DMMACC( char *nodeno, INTGR *nodelg, char *machno, INTGR *machlg, char *systno, INTGR *systlg, char *releno, INTGR *relelg, char *versno, INTGR *verslg, LNSTRF nodebi, LNSTRF machbi, LNSTRF systbi, LNSTRF relebi, LNSTRF versbi ) +extern void __stdcall DMMACC( char *nodeno, LNSTRF nodebi, INTGR *nodelg, char *machno, LNSTRF machbi, INTGR *machlg, char *systno, LNSTRF systbi, INTGR *systlg, char *releno, LNSTRF relebi, INTGR *relelg, char *versno, LNSTRF versbi, INTGR *verslg ) #else void FortranCInterface_GLOBAL(dmmacc, DMMACC)(char *nodeno, INTGR *nodelg, char *machno, INTGR *machlg, char *systno, INTGR *systlg, char *releno, INTGR *relelg, char *versno, INTGR *verslg) #endif