Adding files that I forgot

CMakeLists.txt

@@ -87,6 +87,7 @@ ENDIF()
 IF ( NOT ONLY_BUILD_DOCS )
     CONFIGURE_MPI()     # MPI must be before other libraries
     CONFIGURE_CUDA()
+    CONFIGURE_MIC()
     CONFIGURE_LBPM()
     CONFIGURE_LINE_COVERAGE()
 ENDIF()
@@ -100,12 +101,18 @@ SET( LBPM_LIBS  lbpm-wia )
 IF ( NOT ONLY_BUILD_DOCS )
     BEGIN_PACKAGE_CONFIG( lbpm-wia )
     ADD_PACKAGE_SUBDIRECTORY( include )
-    #ADD_PACKAGE_SUBDIRECTORY( cpu )
-    ADD_PACKAGE_SUBDIRECTORY( gpu )
+    IF ( USE_CUDA )
+        ADD_PACKAGE_SUBDIRECTORY( gpu )
+    ELSE()
+        ADD_PACKAGE_SUBDIRECTORY( cpu )
+    ENDIF()
     INSTALL_LBPM_TARGET( lbpm-wia )
     ADD_SUBDIRECTORY( tests )
-    #ADD_SUBDIRECTORY( cpu/exe )
-    ADD_SUBDIRECTORY( gpu/exe )
+    #IF ( USE_CUDA )
+    #    ADD_SUBDIRECTORY( gpu/exe )
+    #ELSE()
+    #    ADD_SUBDIRECTORY( cpu/exe )
+    #ENDIF()
     INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/example DESTINATION ${LBPM_INSTALL_DIR} )
 ENDIF()
 

cmake/libraries.cmake

@@ -11,6 +11,7 @@ ENDMACRO ()
 MACRO ( CONFIGURE_CUDA )
     SET(CUDA_FLAGS ${CUDA_NVCC_FLAGS})
     SET( CUDA_FIND_QUIETLY 1)
+    CHECK_ENABLE_FLAG( USE_CUDA 0 )
     IF(USE_CUDA)
         INCLUDE ( FindCUDA )
         IF ( NOT CUDA_FOUND )
@@ -24,7 +25,6 @@ MACRO ( CONFIGURE_CUDA )
             STRING(REPLACE " " ";" CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS})
         ENDIF()
     ENDIF()
-  
     IF ( NOT USE_CUDA )
         MESSAGE ( "Not using CUDA" ) 
     ELSE ()
@@ -40,6 +40,13 @@ MACRO ( CONFIGURE_CUDA )
 ENDMACRO ()
 
 
+# Macro to configure CUDA
+MACRO ( CONFIGURE_MIC )
+    CHECK_ENABLE_FLAG( USE_MIC 0 )
+    ADD_DEFINITIONS ( "-D USE_MIC" ) 
+ENDMACRO() 
+
+
 # Macro to find and configure the MPI libraries
 MACRO ( CONFIGURE_MPI )
     # Determine if we want to use MPI

cmake/macros.cmake

@@ -48,14 +48,14 @@ MACRO (FIND_FILES)
     SET( T_CXXSOURCES "" )
     FILE( GLOB T_CXXSOURCES "*.cc" "*.cpp" "*.cxx" "*.C" )
     # Find the C++ sources
-    SET( T_CXXSOURCES "" )
-    FILE( GLOB T_CXXSOURCES "*.cu" )
+    SET( T_CUSOURCES "" )
+    FILE( GLOB T_CUSOURCES "*.cu" )
     # Add all found files to the current lists
     SET( HEADERS ${HEADERS} ${T_HEADERS} )
     SET( CXXSOURCES ${CXXSOURCES} ${T_CXXSOURCES} )
     SET( CSOURCES ${CSOURCES} ${T_CSOURCES} )
+    SET( CUSOURCES ${CUSOURCES} ${T_CUSOURCES} )
     SET( SOURCES ${SOURCES} ${T_CXXSOURCES} ${T_CSOURCES} )
-    SET( CUSOURCES ${SOURCES} ${T_CUSOURCES} )
 ENDMACRO()
 
 
@@ -77,8 +77,8 @@ MACRO (FIND_FILES_PATH IN_PATH)
     SET( HEADERS ${HEADERS} ${T_HEADERS} )
     SET( CXXSOURCES ${CXXSOURCES} ${T_CXXSOURCES} )
     SET( CSOURCES ${CSOURCES} ${T_CSOURCES} )
+    SET( CUSOURCES ${CUSOURCES} ${T_CUSOURCES} )
     SET( SOURCES ${SOURCES} ${T_CXXSOURCES} ${T_CSOURCES} ${T_CUSOURCES} )
-    SET( CUSOURCES ${SOURCES} ${T_CUSOURCES} )
 ENDMACRO()
 
 
@@ -106,7 +106,9 @@ MACRO( INSTALL_LBPM_TARGET PACKAGE )
         CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${HFILE} ${LBPM_INSTALL_DIR}/include/${HFILE} COPYONLY )
     ENDFOREACH()
     # Configure the CUDA files
-    CUDA_COMPILE( CUOBJS ${CUSOURCES} )
+    IF ( CUSOURCES )
+        CUDA_COMPILE( CUOBJS ${CUSOURCES} )
+    ENDIF()
     # Add the library
     ADD_LIBRARY( ${PACKAGE} ${LIB_TYPE} ${SOURCES} ${CUOBJS} )
     SET( TEST_DEP_LIST ${PACKAGE} ${TEST_DEP_LIST} )
@@ -471,6 +473,7 @@ MACRO( ADD_DISTCLEAN )
         liblbpm-wia.so
         cpu
         gpu
+        example
     )
     ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
     IF (UNIX)

cpu/exe/CMakeLists.txt

@@ -1,2 +1 @@
-INSTALL_LBPM_EXE( lb1_MRT_mpi )
 INSTALL_LBPM_EXE( lb2_Color_mpi )