re-organize src dir structure

src/CMakeLists.txt

 # include cmake functions defined in the path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/src/cmake")
 
-include("swig_lib")
-
-# paths for submodule
-set(ODB_HOME ${PROJECT_SOURCE_DIR}/src/odb)
-
-# main program source
-set(MINIEDA_SOURCE
-  MiniEda.cc
-  Main.cc
-  )
-
 # ------------------------- Set Packages
 
 # TCL
@@ -97,83 +86,6 @@ add_compile_options(
 
 ############################################
 
-# Swig Config
-swig_lib(NAME      minieda_swig
-         NAMESPACE eda
-         I_FILE    MiniEda.i
-         SCRIPTS   MiniEda.tcl
-)
-
-target_link_libraries(minieda_swig
-  PRIVATE
-    utl
-)
-
-############################################
-
-# Submodule
+add_subdirectory(main)
 add_subdirectory(utl)
 
-add_executable(minieda
-  ${MINIEDA_SOURCE}
-)
-
-target_compile_options(minieda
-  PRIVATE
-    -Wextra -pedantic -Wcast-qual
-)
-
-set_target_properties(minieda PROPERTIES
-  # Disable compiler specific extensions like gnu++11.
-  CXX_EXTENSIONS OFF
-  # Export symbols for stack trace printing
-  ENABLE_EXPORTS ON
-)
-target_compile_features(minieda PUBLIC cxx_std_17)
-
-target_include_directories(minieda
-  PUBLIC
-    ../include
-    ../pkgs/include
-    ../pkgs/boost_1_78_0
-)
-
-# Link Libraries
-target_link_libraries(minieda
-  minieda_swig
-  utl
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${TCL_LIBRARY}
-)
-
-# tclReadline
-if (TCL_READLINE_LIBRARY AND TCL_READLINE_H)
-  target_compile_definitions(minieda PRIVATE ENABLE_READLINE)
-  target_link_libraries(minieda ${TCL_READLINE_LIBRARY})
-  target_include_directories(minieda PRIVATE ${TCL_READLINE_H})
-  message(STATUS "TCL readline enabled")
-else()
-  message(STATUS "TCL readline disabled")
-endif()
-
-if (BUILD_TCLX AND TCLX_LIBRARY AND TCLX_H)
-  target_compile_definitions(minieda PRIVATE ENABLE_TCLX)
-  target_link_libraries(minieda ${TCLX_LIBRARY})
-  target_include_directories(minieda PRIVATE ${TCLX_H})
-  message(STATUS "Tcl Extended enabled")
-else()
-  message(STATUS "Tcl Extended disabled")
-endif()
-
-if (ZLIB_FOUND)
-  target_link_libraries(minieda ${ZLIB_LIBRARIES})
-endif()
-
-install(TARGETS minieda DESTINATION bin)
-
-add_custom_target(minieda_tags etags -o TAGS
-  ${MINIEDA_SOURCE}
-  ${MINIEDA_HOME}/include/eda/*.hh
-  WORKING_DIRECTORY ${MINIEDA_HOME}/src
-  DEPENDS ${MINIEDA_SOURCE} ${MINIEDA_HEADERS} ${MINIEDA_TCL_FILES}
-)

src/cmake/swig_lib.cmake

@@ -130,7 +130,7 @@ function(swig_lib)
     set(LANG_INIT ${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-${ARG_LANGUAGE}InitVar.cc)
 
     add_custom_command(OUTPUT ${LANG_INIT}
-      COMMAND ${MINIEDA_HOME}/src/etc/TclEncode.tcl ${LANG_INIT} ${ARG_NAME}_${ARG_LANGUAGE}_inits ${ARG_SCRIPTS}
+      COMMAND ${MINIEDA_HOME}/src/cmake/etc/TclEncode.tcl ${LANG_INIT} ${ARG_NAME}_${ARG_LANGUAGE}_inits ${ARG_SCRIPTS}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       DEPENDS ${ARG_SCRIPTS}
     )

src/main/CMakeLists.txt

+# include cmake functions defined in the path
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/src/cmake")
+
+include("swig_lib")
+
+# paths for submodule
+set(ODB_HOME ${PROJECT_SOURCE_DIR}/src/odb)
+
+# main program source
+set(MINIEDA_SOURCE
+  MiniEda.cc
+  Main.cc
+  )
+
+# Swig Config
+swig_lib(NAME      minieda_swig
+         NAMESPACE eda
+         I_FILE    MiniEda.i
+         SCRIPTS   MiniEda.tcl
+)
+
+target_link_libraries(minieda_swig
+  PRIVATE
+    utl
+)
+
+add_executable(minieda
+  ${MINIEDA_SOURCE}
+)
+
+target_compile_options(minieda
+  PRIVATE
+    -Wextra -pedantic -Wcast-qual
+)
+
+set_target_properties(minieda PROPERTIES
+  # Disable compiler specific extensions like gnu++11.
+  CXX_EXTENSIONS OFF
+  # Export symbols for stack trace printing
+  ENABLE_EXPORTS ON
+)
+target_compile_features(minieda PUBLIC cxx_std_17)
+
+target_include_directories(minieda
+  PUBLIC
+    ${MINIEDA_HOME}/include
+    ${MINIEDA_HOME}/pkgs/include
+    ${MINIEDA_HOME}/pkgs/boost_1_78_0
+)
+
+# Link Libraries
+target_link_libraries(minieda
+  minieda_swig
+  utl
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${TCL_LIBRARY}
+)
+
+# tclReadline
+if (TCL_READLINE_LIBRARY AND TCL_READLINE_H)
+  target_compile_definitions(minieda PRIVATE ENABLE_READLINE)
+  target_link_libraries(minieda ${TCL_READLINE_LIBRARY})
+  target_include_directories(minieda PRIVATE ${TCL_READLINE_H})
+  message(STATUS "TCL readline enabled")
+else()
+  message(STATUS "TCL readline disabled")
+endif()
+
+if (BUILD_TCLX AND TCLX_LIBRARY AND TCLX_H)
+  target_compile_definitions(minieda PRIVATE ENABLE_TCLX)
+  target_link_libraries(minieda ${TCLX_LIBRARY})
+  target_include_directories(minieda PRIVATE ${TCLX_H})
+  message(STATUS "Tcl Extended enabled")
+else()
+  message(STATUS "Tcl Extended disabled")
+endif()
+
+if (ZLIB_FOUND)
+  target_link_libraries(minieda ${ZLIB_LIBRARIES})
+endif()
+
+install(TARGETS minieda DESTINATION bin)
+
+add_custom_target(minieda_tags etags -o TAGS
+  ${MINIEDA_SOURCE}
+  ${MINIEDA_HOME}/include/eda/*.hh
+  WORKING_DIRECTORY ${MINIEDA_HOME}/src
+  DEPENDS ${MINIEDA_SOURCE} ${MINIEDA_HEADERS} ${MINIEDA_TCL_FILES}
+)

src/MiniEda.i → src/main/MiniEda.i

@@ -37,7 +37,7 @@ using eda::getLogger;
 ////////////////////////////////////////////////////////////////
 
 #ifdef SWIGTCL
-%include "Exception.i"
+%include "../Exception.i"
 
 // %typemap(in) utl::ToolId {
 //   int length;