iSharkFly-Open
/
fis-gtm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganized include_directories. 

Remove the defaults from the top CMakeLists.txt file,
and selectively added them to the subdirectories.
This commit is contained in:
Luis Ibanez 2012-03-25 21:20:19 -04:00
parent 7c395c9a26
commit 822567f3c4
11 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -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)

27
executables/CMakeLists.txt
View File

@ -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()

2
pro/obj/CMakeLists.txt
View File

@ -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()

2
sr_i386/CMakeLists.txt
View File

@ -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()

1
sr_linux/CMakeLists.txt
View File

@ -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}

2
sr_port/CMakeLists.txt
View File

@ -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()

2
sr_port_cm/CMakeLists.txt
View File

@ -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()

24
sr_unix/CMakeLists.txt
View File

@ -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

2
sr_unix_cm/CMakeLists.txt
View File

@ -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()

2
sr_unix_gnp/CMakeLists.txt
View File

@ -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()

4
sr_unix_nsb/CMakeLists.txt
View File

@ -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()