diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aa5e00..62480f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,9 +96,27 @@ 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 + ${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 + ) +endif() + + +if(ARCHITECTURE_IS_64_BITS) + include_directories( + ${fis-gtm_SOURCE_DIR}/sr_x86_64 + ) +endif() + + + # # Visit subdirectories # @@ -122,3 +140,25 @@ if(ARCHITECTURE_IS_64_BITS) add_subdirectory(sr_x86_64) endif() + +#if(EXECUTABLES_READY) + +add_executable(dse + sr_unix/lke.c + sr_unix/lke_cmd.c + sr_unix/lke_ctrlc_handler.c + ) + +target_link_libraries(dse +# dseunix +# dseport + lkeport + fisgtmproobj + fisgtmx64 + mumpsport + mumpsunix + elf + dl + ) + +# endif() diff --git a/sr_unix/CMakeLists.txt b/sr_unix/CMakeLists.txt index 98ca899..3e7a19a 100644 --- a/sr_unix/CMakeLists.txt +++ b/sr_unix/CMakeLists.txt @@ -1,17 +1,3 @@ -if(ARCHITECTURE_IS_32_BITS) - include_directories( - ${fis-gtm_SOURCE_DIR}/sr_i386 - ${fis-gtm_SOURCE_DIR}/sr_unix_nsb - ) -endif() - - -if(ARCHITECTURE_IS_64_BITS) - include_directories( - ${fis-gtm_SOURCE_DIR}/sr_x86_64 - ) -endif() - include_directories( ${fis-gtm_SOURCE_DIR}/sr_port_cm @@ -387,10 +373,7 @@ if(NEED_TO_ADD_SOURCES) ) endif(NEED_TO_ADD_SOURCES) -set(GTM_LKE_SRC_C - lke.c - lke_cmd.c - lke_ctrlc_handler.c +set(GTM_LKE_UNIX_SRC_C lke_fileio.c lke_getansw.c lke_help.c @@ -509,15 +492,15 @@ set(GTM_STUB_UNIX_SRC_C ) -add_library(lke - ${GTM_LKE_SRC_C} +add_library(lkeunix + ${GTM_LKE_UNIX_SRC_C} ) add_library(mupip ${GTM_MUPIP_SRC_C} ) -add_library(mumps +add_library(mumpsunix ${GTM_MUMPS2_SRC_C} ) @@ -540,3 +523,4 @@ add_library(dbcertifyunix dbcertify_signal_handler.c ) +