diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ece1a3..b2ae453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,16 +90,6 @@ install_gtm_preconfigured("pro/plugin/gtmcrypt" "main_pragma.h") install_gtm_preconfigured("pro/plugin/gtmcrypt" "maskpass.c") -# -# And add these directories to the header search path -# -include_directories( - ${fis-gtm_BINARY_DIR}/pro - ${fis-gtm_BINARY_DIR}/pro/obj - ${fis-gtm_BINARY_DIR}/pro/utf8 - ${fis-gtm_SOURCE_DIR}/sr_port - ) - # # Configure to build assembly files @@ -150,6 +140,7 @@ add_subdirectory(pro) # if(ARCHITECTURE_IS_32_BITS) add_subdirectory(sr_i386) + add_subdirectory(sr_unix_nsb) endif() if(ARCHITECTURE_IS_64_BITS) diff --git a/executables/CMakeLists.txt b/executables/CMakeLists.txt index e79f56d..25f9045 100644 --- a/executables/CMakeLists.txt +++ b/executables/CMakeLists.txt @@ -1,7 +1,23 @@ -include_directories( - ${fis-gtm_SOURCE_DIR}/sr_unix - ) +if(ARCHITECTURE_IS_32_BITS) + include_directories( + ${fis-gtm_SOURCE_DIR}/sr_i386 + ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj + ${fis-gtm_SOURCE_DIR}/sr_unix + ${fis-gtm_SOURCE_DIR}/sr_port + ) +endif() + + +if(ARCHITECTURE_IS_64_BITS) + include_directories( + ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj + ${fis-gtm_SOURCE_DIR}/sr_unix + ${fis-gtm_SOURCE_DIR}/sr_port + ) +endif() # @@ -11,6 +27,11 @@ if(ARCHITECTURE_IS_32_BITS) set(ARCHITECTURE_DEPENDENT_LIBRARIES ${ARCHITECTURE_DEPENDENT_LIBRARIES} fisgtmi386 + stubunix + gtmunixcm + cmisockettcp + frameport + gtm_unix_nsb ) endif() diff --git a/pro/obj/CMakeLists.txt b/pro/obj/CMakeLists.txt index 8fa1d1c..d70546a 100644 --- a/pro/obj/CMakeLists.txt +++ b/pro/obj/CMakeLists.txt @@ -2,6 +2,7 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +10,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_i386/CMakeLists.txt b/sr_i386/CMakeLists.txt index 9e46a1e..9b763c1 100644 --- a/sr_i386/CMakeLists.txt +++ b/sr_i386/CMakeLists.txt @@ -2,6 +2,7 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +10,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_linux/CMakeLists.txt b/sr_linux/CMakeLists.txt index e220ae1..e717c40 100644 --- a/sr_linux/CMakeLists.txt +++ b/sr_linux/CMakeLists.txt @@ -2,6 +2,7 @@ include_directories( ${fis-gtm_SOURCE_DIR}/sr_port ${fis-gtm_SOURCE_DIR}/sr_unix ${fis-gtm_SOURCE_DIR}/sr_linux + ${fis-gtm_BINARY_DIR}/pro/obj ) add_library(gtmlinux ${LIBRARY_TYPE} diff --git a/sr_port/CMakeLists.txt b/sr_port/CMakeLists.txt index 30eb22c..7840bc7 100644 --- a/sr_port/CMakeLists.txt +++ b/sr_port/CMakeLists.txt @@ -3,6 +3,7 @@ if(ARCHITECTURE_IS_32_BITS) ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb ${fis-gtm_SOURCE_DIR}/sr_unix + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -11,6 +12,7 @@ if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 ${fis-gtm_SOURCE_DIR}/sr_unix + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_port_cm/CMakeLists.txt b/sr_port_cm/CMakeLists.txt index eedde60..7669e27 100644 --- a/sr_port_cm/CMakeLists.txt +++ b/sr_port_cm/CMakeLists.txt @@ -2,6 +2,7 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +10,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_unix/CMakeLists.txt b/sr_unix/CMakeLists.txt index 95c9864..4e0cb8e 100644 --- a/sr_unix/CMakeLists.txt +++ b/sr_unix/CMakeLists.txt @@ -2,10 +2,10 @@ include_directories( ${fis-gtm_SOURCE_DIR}/sr_port_cm ${fis-gtm_SOURCE_DIR}/sr_port - ${fis-gtm_SOURCE_DIR}/pro/obj ${fis-gtm_SOURCE_DIR}/sr_unix ${fis-gtm_SOURCE_DIR}/sr_linux ${fis-gtm_SOURCE_DIR}/sr_x86_regs + ${fis-gtm_BINARY_DIR}/pro/obj ) set(GTM_MUMPS2_SRC_C @@ -163,6 +163,17 @@ set(GTM_MUMPS2_SRC_C op_zattach.c op_zhelp_xfr.c op_ztrigger.c + source_file.c + getzprocess.c + trigger_source_read_andor_verify.c + ss_context_mgr.c + mumps_clitab.c + sgtm_putmsg.c + io_init_name.c + io_is_rm.c + io_is_sn.c + io_is_tt.c + gtm_getmsg.c ) if(ARCHITECTURE_IS_64_BITS) @@ -190,7 +201,6 @@ if(ARCHITECTURE_IS_64_BITS) getmaxfds.c getstorage.c getzmode.c - getzprocess.c golevel.c goq_load.c grab_crit.c @@ -205,7 +215,6 @@ if(ARCHITECTURE_IS_64_BITS) gtm_file_remove.c gtm_file_stat.c gtm_fork_n_core.c - gtm_getmsg.c gtm_init_env.c gtm_pipe.c gtm_rename.c @@ -229,10 +238,6 @@ if(ARCHITECTURE_IS_64_BITS) heartbeat_timer.c init_gtm.c io_get_fgn_driver.c - io_init_name.c - io_is_rm.c - io_is_sn.c - io_is_tt.c io_open_try.c io_type.c iob_close.c @@ -290,7 +295,6 @@ if(ARCHITECTURE_IS_64_BITS) mem_access.c mubexpfilnam.c mubfilcpy.c - mumps_clitab.c mup_bak_sys.c # mupip.c it has a main -> executable mupip_cmd.c @@ -320,10 +324,7 @@ if(ARCHITECTURE_IS_64_BITS) send_msg.c set_jnl_file_close.c set_zstatus.c - sgtm_putmsg.c sleep.c - source_file.c - ss_context_mgr.c ss_lock_facility.c ss_release.c ss_shdw_mgr.c @@ -342,7 +343,6 @@ if(ARCHITECTURE_IS_64_BITS) trigger_read_name_entry.c trigger_scan_string.c trigger_select.c - trigger_source_read_andor_verify.c trigger_tpwrap_ch.c trigger_trgfile.c trigger_update.c diff --git a/sr_unix_cm/CMakeLists.txt b/sr_unix_cm/CMakeLists.txt index 67c25de..d655bcc 100644 --- a/sr_unix_cm/CMakeLists.txt +++ b/sr_unix_cm/CMakeLists.txt @@ -2,6 +2,7 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +10,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_unix_gnp/CMakeLists.txt b/sr_unix_gnp/CMakeLists.txt index 93e39e9..27ce926 100644 --- a/sr_unix_gnp/CMakeLists.txt +++ b/sr_unix_gnp/CMakeLists.txt @@ -2,6 +2,7 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +10,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() diff --git a/sr_unix_nsb/CMakeLists.txt b/sr_unix_nsb/CMakeLists.txt index 5590cae..f3fc28a 100644 --- a/sr_unix_nsb/CMakeLists.txt +++ b/sr_unix_nsb/CMakeLists.txt @@ -2,6 +2,9 @@ if(ARCHITECTURE_IS_32_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_i386 ${fis-gtm_SOURCE_DIR}/sr_unix_nsb + ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_SOURCE_DIR}/sr_x86_regs + ${fis-gtm_BINARY_DIR}/pro/obj ) endif() @@ -9,6 +12,7 @@ endif() if(ARCHITECTURE_IS_64_BITS) include_directories( ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ${fis-gtm_BINARY_DIR}/pro/obj ) endif()