changeset 69:f236eba62a76

off-the-shelf cmakefile
author anatofuz
date Sun, 28 Jul 2019 20:03:15 +0900
parents eafd3ba7f48b
children 1e1c6feb7d83
files src/CMakeLists.txt src/gearsTools/pmake.pl src/tools/CMakeLists.txt src/usr/CMakeLists.txt
diffstat 4 files changed, 21 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/CMakeLists.txt	Fri Jul 26 19:41:26 2019 +0900
+++ b/src/CMakeLists.txt	Sun Jul 28 20:03:15 2019 +0900
@@ -22,6 +22,7 @@
 
 if (${USE_CUDA})
     include_directories("/usr/local/cuda/include")
+    include_directories(${CMAKE_SOURCE_DIR})
     set(NVCCFLAG "-std=c++11" "-g" "-O0" )
     if (UNIX AND NOT APPLE) # LINUX
         set(CUDA_LINK_FLAGS "-L/usr/local/cuda/lib64 -lcuda -lcudart")
@@ -44,6 +45,7 @@
     set( _ONE_VALUE_ARGS TARGET )
     set( _MULTI_VALUE_ARGS SOURCES )
     cmake_parse_arguments( _Gears "${_OPTIONS_ARGS}" "${_ONE_VALUE_ARGS}" "${_MULTI_VALUE_ARGS}" ${ARGN} )
+    set(CMAKE_KERNEL_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_Gears_TARGET}.dir")
 
     set (_Gears_CBC_SOURCES)
     set (_Gears_CSOURCES)
@@ -51,15 +53,16 @@
         if (${i} MATCHES "\\.cbc")
             string(REGEX REPLACE "(.*).cbc" "c/\\1.c" j ${i})
             add_custom_command (
-                OUTPUT    ${j}
+                OUTPUT    ${CMAKE_KERNEL_OUTPUT_DIR}/${j}
                 DEPENDS   ${i}
-                COMMAND  "perl" "gearsTools/generate_stub.pl" "-o" ${j} ${i}
+                COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_stub.pl" "-o" ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_Gears_TARGET}.dir/${j} ${CMAKE_SOURCE_DIR}/${i}
             )
+            # list(APPEND _Gears_CBC_SOURCES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_Gears_TARGET}.dir/${j}")
             list(APPEND _Gears_CBC_SOURCES ${j})
         elseif (${i} MATCHES "\\.cu")
             string(REGEX REPLACE "(.*).cu" "c/\\1.ptx" j ${i})
             add_custom_command (
-                OUTPUT    ${j}
+                OUTPUT    ${CMAKE_KERNEL_OUTPUT_DIR}/${j}
                 DEPENDS   ${i}
                 COMMAND  nvcc ${NVCCFLAG} -c -ptx -o ${j} ${i}
             )
@@ -72,9 +75,9 @@
 
     #target_link_libraries(syslib)
     add_custom_command (
-          OUTPUT    c/${_Gears_TARGET}-context.c
+          OUTPUT    ${CMAKE_KERNEL_OUTPUT_DIR}/c/${_Gears_TARGET}-context.c
           DEPENDS   ${_Gears_CBC_SOURCES} fs.img initcode
-          COMMAND  "perl" "gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} ${_Gears_CBC_SOURCES}
+          COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_context.pl" "-o" ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_Gears_TARGET} ${_Gears_CBC_SOURCES}
     )
     add_executable(${_Gears_TARGET} ${_Gears_CBC_SOURCES} ${_Gears_CSOURCES} c/${_Gears_TARGET}-context.c )
     #  target_link_libraries(${_Gears_TARGET} m pthread)
@@ -87,7 +90,7 @@
 add_custom_command(
   OUTPUT  initcode
   DEPENDS initcode.o
-  COMMAND "arm-none-eabi-objcopy" "-S" "-O" "binary" "--prefix-symbols=\"_binary_build/initcode\"" "initcode.o" "initcode"
+  COMMAND "arm-none-eabi-objcopy" "-S" "-O" "binary" "--prefix-symbols=\"_binary_build/initcode\"" "${CMAKE_BINARY_DIR}/initcode.o" "${CMAKE_BINARY_DIR}/initcode"
 )
 
 GearsCommand (
@@ -98,4 +101,3 @@
 	start.c swtch.S syscall.cbc sysfile.cbc sysproc.c trap_asm.S trap.c vm.c device/picirq.c device/timer.c device/uart.c
          entry.S 
 )
-
--- a/src/gearsTools/pmake.pl	Fri Jul 26 19:41:26 2019 +0900
+++ b/src/gearsTools/pmake.pl	Sun Jul 28 20:03:15 2019 +0900
@@ -21,7 +21,6 @@
              -DCBCXV6=1 -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -I. -g -O0|;
     $ld     = '/mnt/dalmore-home/one/src/armgcc/cross/bin/arm-none-eabi-ld';
     chomp($libgcc = `$cc --print-libgcc-file-name`);
-    $cflags .= " $libgcc";
     $cmake  .= 3;
     $ldflags = " -L. -T kernel-cmake.ld";
     $kernel_cflags   = '-march=armv6 -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -Werror -I. -g -O0 -iquote ../   -c';
@@ -36,7 +35,6 @@
 create_link_script();
 
 print_exec_system($cmake,
-     "-DGCC_LIB=$libgcc",
      "-DCBC_COM=$cc",
      "-DPMAKE_ARGS=\"$cflags\"",
     "-DCMAKE_ASM_COMPILER=$cc",
@@ -46,7 +44,8 @@
     "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",
     "-DINITOCDE_CFLAGS=\"$initcode_cflags\"",
     "-DINITOCDE_LINK_EXECUTABLE=\"$initcode_ld_command\"",
-@ARGV);
+    "-S $ARGV[1]",
+$ARGV[0]);
 
 system("make");
 #system("sh","link.sh");
--- a/src/tools/CMakeLists.txt	Fri Jul 26 19:41:26 2019 +0900
+++ b/src/tools/CMakeLists.txt	Sun Jul 28 20:03:15 2019 +0900
@@ -2,5 +2,6 @@
 project(tools C)
 SET(CMAKE_C_COMPILER /usr/bin/cc)
 
-set(CMAKE_C_FLAGS "-Wall  -iquote ../")
+set(CMAKE_C_FLAGS "-Wall  -iquote ${CMAKE_SOURCE_DIR}")
+
 add_executable(mkfs mkfs.c)
--- a/src/usr/CMakeLists.txt	Fri Jul 26 19:41:26 2019 +0900
+++ b/src/usr/CMakeLists.txt	Sun Jul 28 20:03:15 2019 +0900
@@ -7,12 +7,16 @@
 add_definitions(${PMAKE_ARGS})
 set(CMAKE_C_COMPILER "${CBC_COM}")
 
-include_directories("..")
+#include_directories("..")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
 set(CMAKE_C_LINK_EXECUTABLE "${KERNEL_LINK_EXECUTABLE}")
 set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LIB} -nostdlib")
 
 macro( GearsCommand )
+    include_directories(${CMAKE_SOURCE_DIR})
+    include_directories(${CMAKE_SOURCE_DIR}/usr)
+    include_directories(${CMAKE_BINARY_DIR}/usr/c)
+  
     set( _OPTIONS_ARGS )
     set( _ONE_VALUE_ARGS TARGET )
     set( _MULTI_VALUE_ARGS SOURCES )
@@ -26,7 +30,7 @@
             add_custom_command (
                 OUTPUT    ${j}
                 DEPENDS   ${i}
-                COMMAND  "perl" "../gearsTools/generate_stub.pl" "-o" ${j} ${i}
+                COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_stub.pl" "-o" ${j} ${i}
             )
             list(APPEND _Gears_CBC_SOURCES ${j})
         elseif (${i} MATCHES "\\.cu")
@@ -46,7 +50,7 @@
     add_custom_command (
           OUTPUT    c/${_Gears_TARGET}-context.c
           DEPENDS   ${_Gears_CBC_SOURCES}
-          COMMAND  "perl" "../gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} ${_Gears_CBC_SOURCES}
+          COMMAND  "perl" "${CMAKE_SOURCE_DIR}/gearsTools/generate_context.pl" "-o" ${_Gears_TARGET} ${_Gears_CBC_SOURCES}
     )
     add_executable(${_Gears_TARGET} ${_Gears_CBC_SOURCES} ${_Gears_CSOURCES} c/${_Gears_TARGET}-context.c )
     target_link_libraries(${_Gears_TARGET} ulib)
@@ -67,6 +71,6 @@
 endforeach(i)
 
 add_custom_target(fs.img ALL
-  COMMAND ../tools/mkfs fs.img ${_USR_COMMANDS} UNIX \; cp fs.img ${CMAKE_SOURCE_DIR}
+  COMMAND ${CMAKE_SOURCE_DIR}/tools/mkfs fs.img ${_USR_COMMANDS} UNIX \; cp fs.img ${CMAKE_SOURCE_DIR}
   DEPENDS ${_USR_COMMANDS} mkfs
 )