Compile util/*.c in all modules

Now we can share C files in util directory
shinpei0208 · Nov 19, 2013 · 360d0cb · 360d0cb
1 parent 593a0c1
commit 360d0cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cuda/CMakeLists.txt b/cuda/CMakeLists.txt
@@ -26,6 +26,7 @@ FIND_PACKAGE(BISON)
 FILE(GLOB cudump_src "cudump/*.c")
 SET(cudump_src ${cudump_src} driver/gdev_cuda.c )
 ## Driver API
+FILE(GLOB util_src "${PROJECT_SOURCE_DIR}/util/*.c")
 FILE(GLOB common_src "driver/*.c")
 FILE(GLOB common_ext_src "driver/extension/*.c")
 
@@ -61,9 +62,9 @@ SET(ocelot_src
 ### Hydrazine sources
 FILE(GLOB hydrazine_src "runtime/hydrazine/implementation/*.cpp")
 
-# select source 
+# select source
 SET(ucuda_src
-    ${ucuda_src} ${common_src} ${common_ext_src}
+    ${ucuda_src} ${util_src} ${common_src} ${common_ext_src}
     )
 
 IF(runtime)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -21,6 +21,7 @@ set(common_src
     ${PROJECT_SOURCE_DIR}/common/gdev_nvidia_shm.c
     ${PROJECT_SOURCE_DIR}/common/gdev_sched.c
 )
+file(GLOB util_src "${PROJECT_SOURCE_DIR}/util/*.c")
 file(GLOB nvrm_src "user/nvrm/*.c")
 file(GLOB user_src "user/gdev/*.c")
 file(GLOB nouveau_src "user/nouveau/*.c")
@@ -33,7 +34,7 @@ SET(gdev_inc /usr/local/gdev/include)
 ## select source 
 IF(user)
     MESSAGE(Selected\ User-space!)
-    SET(gdev_src ${gdev_src} ${user_src} ${common_src})
+    SET(gdev_src ${gdev_src} ${user_src} ${common_src} ${util_src})
     SET(gdev_inc ${gdev_inc} 
 	/usr/include/libdrm 
 	${PROJECT_SOURCE_DIR}/common/