Skip to content

Commit 3c4258a

Browse files
committed
make examples and tests proper cmake projects
this will let us build examples and tests independently of occa.
1 parent 61e67ab commit 3c4258a

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

examples/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
cmake_minimum_required (VERSION 3.21 FATAL_ERROR)
2+
project(OCCAExamples
3+
VERSION 2.0.0
4+
DESCRIPTION "OCCA Examples"
5+
HOMEPAGE_URL "https://github.com/libocca/occa"
6+
LANGUAGES CXX)
7+
8+
if (NOT TARGET OCCA::libocca)
9+
find_package(OCCA REQUIRED)
10+
endif()
11+
112
macro(add_test_with_mode exe mode device)
213
add_test(NAME ${exe}-${mode} COMMAND ./${exe} --verbose --device "${device}")
314
set_property(TEST ${exe}-${mode} APPEND PROPERTY ENVIRONMENT OCCA_CACHE_DIR=${OCCA_BUILD_DIR}/occa)
@@ -32,7 +43,7 @@ endmacro()
3243

3344
macro(compile_example target file mode)
3445
add_executable(${target} ${file})
35-
target_link_libraries(${target} libocca)
46+
target_link_libraries(${target} OCCA::libocca)
3647
target_include_directories(${target} PRIVATE $<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
3748

3849
file(RELATIVE_PATH install_dir ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_LIST_DIR})

tests/CMakeLists.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
cmake_minimum_required (VERSION 3.21 FATAL_ERROR)
2+
project(OCCATests
3+
VERSION 2.0.0
4+
DESCRIPTION "OCCA Tests"
5+
HOMEPAGE_URL "https://github.com/libocca/occa"
6+
LANGUAGES CXX)
7+
8+
if (NOT TARGET OCCA::libocca)
9+
find_package(OCCA REQUIRED)
10+
endif()
11+
112
function(add_occa_test test_source)
213
# Metadata
314
get_filename_component(source_directory ${test_source} DIRECTORY)
@@ -17,7 +28,7 @@ function(add_occa_test test_source)
1728
RUNTIME_OUTPUT_DIRECTORY ${test_directory})
1829

1930
# Build config
20-
target_link_libraries(${cmake_test_target} libocca ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
31+
target_link_libraries(${cmake_test_target} OCCA::libocca ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
2132
target_include_directories(${cmake_test_target} PRIVATE
2233
$<BUILD_INTERFACE:${OCCA_SOURCE_DIR}/src>)
2334

@@ -50,7 +61,7 @@ if (OCCA_ENABLE_FORTRAN)
5061
EXCLUDE REGEX "src/fortran/typedefs_helper.cpp")
5162

5263
add_library(libtypedefs_helper SHARED "src/fortran/typedefs_helper.cpp")
53-
target_link_libraries(libtypedefs_helper libocca)
64+
target_link_libraries(libtypedefs_helper OCCA::libocca)
5465
else()
5566
list(FILTER occa_tests
5667
EXCLUDE REGEX "src/fortran")

0 commit comments

Comments
 (0)