Skip to content

Commit b68658f

Browse files
jhalejhale
authored
Namespace target dolfinx::dolfinx (#4274)
1 parent d0d8ae2 commit b68658f

14 files changed

Lines changed: 35 additions & 30 deletions

File tree

‎cpp/cmake/scripts/generate-cmakefiles.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
set(PROJECT_NAME {project_name})
1818
project(${{PROJECT_NAME}} LANGUAGES C CXX)
1919
20-
if(NOT TARGET dolfinx)
20+
if(NOT TARGET dolfinx::dolfinx)
2121
find_package(DOLFINX REQUIRED)
2222
endif()
2323
2424
add_executable(${{PROJECT_NAME}} {src_files})
25-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
25+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
2626
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
2727
2828
# Set C++20 standard
@@ -58,7 +58,7 @@
5858
set(PROJECT_NAME {project_name})
5959
project(${{PROJECT_NAME}} LANGUAGES C CXX)
6060
61-
if(NOT TARGET dolfinx)
61+
if(NOT TARGET dolfinx::dolfinx)
6262
find_package(DOLFINX REQUIRED)
6363
endif()
6464
@@ -94,7 +94,7 @@
9494
)
9595
9696
add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
97-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
97+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
9898
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
9999
100100
# Set C++20 standard
@@ -136,7 +136,7 @@
136136
set(PROJECT_NAME {project_name})
137137
project(${{PROJECT_NAME}} LANGUAGES C CXX)
138138
139-
if(NOT TARGET dolfinx)
139+
if(NOT TARGET dolfinx::dolfinx)
140140
find_package(DOLFINX REQUIRED)
141141
endif()
142142
@@ -171,7 +171,7 @@
171171
)
172172
173173
add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
174-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
174+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
175175
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
176176
177177
# Set C++20 standard

‎cpp/cmake/templates/DOLFINXConfig.cmake.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(@ADIOS2_FOUND@)
118118
)
119119
endif()
120120

121-
if(NOT TARGET dolfinx)
121+
if(NOT TARGET dolfinx::dolfinx)
122122
include("${CMAKE_CURRENT_LIST_DIR}/DOLFINXTargets.cmake")
123123
endif()
124124

‎cpp/demo/biharmonic/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_biharmonic)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

@@ -42,7 +42,7 @@ add_custom_command(
4242
)
4343

4444
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/biharmonic.c)
45-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4646
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4747

4848
# Set C++20 standard

‎cpp/demo/codim_0_assembly/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_codim_0_assembly)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

@@ -42,7 +42,7 @@ add_custom_command(
4242
)
4343

4444
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/mixed_codim0.c)
45-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4646
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4747

4848
# Set C++20 standard

‎cpp/demo/custom_kernel/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_custom_kernel)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

1414
add_executable(${PROJECT_NAME} main.cpp)
15-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1616
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1717

1818
# Set C++20 standard

‎cpp/demo/hyperelasticity/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_hyperelasticity)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

@@ -43,7 +43,7 @@ else()
4343
)
4444

4545
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/hyperelasticity.c)
46-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
46+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4747
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4848

4949
# Set C++20 standard

‎cpp/demo/interpolation-io/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_interpolation-io)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

1414
add_executable(${PROJECT_NAME} main.cpp)
15-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1616
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1717

1818
# Set C++20 standard

‎cpp/demo/interpolation_different_meshes/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_interpolation_different_meshes)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

1414
add_executable(${PROJECT_NAME} main.cpp)
15-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1616
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1717

1818
# Set C++20 standard

‎cpp/demo/mixed_poisson/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_mixed_poisson)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

@@ -42,7 +42,7 @@ add_custom_command(
4242
)
4343

4444
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/mixed_poisson.c)
45-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4646
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4747

4848
# Set C++20 standard

‎cpp/demo/poisson/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_poisson)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1111
find_package(DOLFINX REQUIRED)
1212
endif()
1313

@@ -42,7 +42,7 @@ add_custom_command(
4242
)
4343

4444
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/poisson.c)
45-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4646
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4747

4848
# Set C++20 standard

0 commit comments

Comments
 (0)