diff options
| -rw-r--r-- | contrib/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | contrib/bindacl/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | contrib/convacl/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | contrib/kerneltesting/CMakeLists.txt | 8 |
4 files changed, 28 insertions, 16 deletions
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 69c4fee48..78417eacb 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,18 +1,6 @@ file(GLOB CONTRIB_CMAKE_FILES "*/CMakeLists.txt") -if(BUILD_LABS) - # TODO: These came from labs. Decide when to build these without using BUILD_LABS - if(${TARGET_ARCH_BASE} STREQUAL "arm") - add_subdirectory(bindacl) - add_subdirectory(convacl) - add_subdirectory(kerneltesting) - endif() - -elseif(BUILD_LABS) - - foreach(CONTRIB_CMAKE_FILE ${CONTRIB_CMAKE_FILES}) - get_filename_component(CONTRIB_BASE ${CONTRIB_CMAKE_FILE} DIRECTORY) - add_subdirectory(${CONTRIB_BASE}) - endforeach(CONTRIB_CMAKE_FILE ${CONTRIB_CMAKE_FILES}) - -endif(BUILD_LABS) +foreach(CONTRIB_CMAKE_FILE ${CONTRIB_CMAKE_FILES}) + get_filename_component(CONTRIB_BASE ${CONTRIB_CMAKE_FILE} DIRECTORY) + add_subdirectory(${CONTRIB_BASE}) +endforeach(CONTRIB_CMAKE_FILE ${CONTRIB_CMAKE_FILES}) diff --git a/contrib/bindacl/CMakeLists.txt b/contrib/bindacl/CMakeLists.txt index 200cc176a..7fc6375a4 100644 --- a/contrib/bindacl/CMakeLists.txt +++ b/contrib/bindacl/CMakeLists.txt @@ -1,3 +1,11 @@ +if(NOT BUILD_LABS) + return() +endif(NOT BUILD_LABS) + +if(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + return() +endif(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + file(GLOB_RECURSE NNAPI_BINDACL_SRCS "src/*.cc") link_directories(${CMAKE_INSTALL_PREFIX}/lib) diff --git a/contrib/convacl/CMakeLists.txt b/contrib/convacl/CMakeLists.txt index ff2920579..62ce3e01a 100644 --- a/contrib/convacl/CMakeLists.txt +++ b/contrib/convacl/CMakeLists.txt @@ -1,3 +1,11 @@ +if(NOT BUILD_LABS) + return() +endif(NOT BUILD_LABS) + +if(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + return() +endif(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + file(GLOB_RECURSE NNAPI_CONVACL_SRCS "src/*.cc") link_directories(${CMAKE_INSTALL_PREFIX}/lib) diff --git a/contrib/kerneltesting/CMakeLists.txt b/contrib/kerneltesting/CMakeLists.txt index fce17bd89..d927409f8 100644 --- a/contrib/kerneltesting/CMakeLists.txt +++ b/contrib/kerneltesting/CMakeLists.txt @@ -1,3 +1,11 @@ +if(NOT BUILD_LABS) + return() +endif(NOT BUILD_LABS) + +if(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + return() +endif(NOT ${TARGET_ARCH_BASE} STREQUAL "arm") + function(add_kerneltesting TESTNAME SRC_FILES) link_directories(${CMAKE_INSTALL_PREFIX}/lib) add_executable(${TESTNAME} ${SRC_FILES}) |