Skip to content

Commit cbfe2fb

Browse files
jhalejhale
committed
Merge remote-tracking branch 'origin/main' into jhale/build-wheels-mac
2 parents 7f119d9 + b68658f commit cbfe2fb

15 files changed

Lines changed: 69 additions & 79 deletions

File tree

‎cpp/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/dolfinx")
5353
include(FeatureSummary)
5454
include(GNUInstallDirs)
5555

56-
set(CMAKE_CXX_EXTENSIONS OFF)
57-
5856
option(BUILD_SHARED_LIBS "Build DOLFINx with shared libraries." ON)
5957
add_feature_info(
6058
BUILD_SHARED_LIBS

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@
1717
set(PROJECT_NAME {project_name})
1818
project(${{PROJECT_NAME}} LANGUAGES C CXX)
1919
20-
set(CMAKE_CXX_EXTENSIONS OFF)
21-
22-
if(NOT TARGET dolfinx)
20+
if(NOT TARGET dolfinx::dolfinx)
2321
find_package(DOLFINX REQUIRED)
2422
endif()
2523
2624
add_executable(${{PROJECT_NAME}} {src_files})
27-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
25+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
2826
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
2927
3028
# Set C++20 standard
3129
target_compile_features(${{PROJECT_NAME}} PRIVATE cxx_std_20)
30+
set_target_properties(${{PROJECT_NAME}} PROPERTIES CXX_EXTENSIONS OFF)
3231
3332
# Do not throw error for 'multi-line comments' (these are typical in rst which
3433
# includes LaTeX)
@@ -59,9 +58,7 @@
5958
set(PROJECT_NAME {project_name})
6059
project(${{PROJECT_NAME}} LANGUAGES C CXX)
6160
62-
set(CMAKE_CXX_EXTENSIONS OFF)
63-
64-
if(NOT TARGET dolfinx)
61+
if(NOT TARGET dolfinx::dolfinx)
6562
find_package(DOLFINX REQUIRED)
6663
endif()
6764
@@ -97,11 +94,12 @@
9794
)
9895
9996
add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
100-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
97+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
10198
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
10299
103100
# Set C++20 standard
104101
target_compile_features(${{PROJECT_NAME}} PRIVATE cxx_std_20)
102+
set_target_properties(${{PROJECT_NAME}} PROPERTIES CXX_EXTENSIONS OFF)
105103
106104
# Do not throw error for 'multi-line comments' (these are typical in rst which
107105
# includes LaTeX)
@@ -138,9 +136,7 @@
138136
set(PROJECT_NAME {project_name})
139137
project(${{PROJECT_NAME}} LANGUAGES C CXX)
140138
141-
set(CMAKE_CXX_EXTENSIONS OFF)
142-
143-
if(NOT TARGET dolfinx)
139+
if(NOT TARGET dolfinx::dolfinx)
144140
find_package(DOLFINX REQUIRED)
145141
endif()
146142
@@ -175,11 +171,12 @@
175171
)
176172
177173
add_executable(${{PROJECT_NAME}} {src_files} ${{CMAKE_CURRENT_BINARY_DIR}}/{ufl_c_files})
178-
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx)
174+
target_link_libraries(${{PROJECT_NAME}} PRIVATE dolfinx::dolfinx)
179175
target_include_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_CURRENT_BINARY_DIR}})
180176
181177
# Set C++20 standard
182178
target_compile_features(${{PROJECT_NAME}} PRIVATE cxx_std_20)
179+
set_target_properties(${{PROJECT_NAME}} PROPERTIES CXX_EXTENSIONS OFF)
183180
184181
# Do not throw error for 'multi-line comments' (these are typical in rst which
185182
# includes LaTeX)

‎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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ cmake_minimum_required(VERSION 3.26)
77
set(PROJECT_NAME demo_biharmonic)
88
project(${PROJECT_NAME} LANGUAGES C CXX)
99

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

@@ -44,11 +42,12 @@ add_custom_command(
4442
)
4543

4644
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/biharmonic.c)
47-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4846
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4947

5048
# Set C++20 standard
5149
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
50+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
5251

5352
# Do not throw error for 'multi-line comments' (these are typical in rst which
5453
# includes LaTeX)

‎cpp/demo/codim_0_assembly/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +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-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

@@ -44,11 +42,12 @@ add_custom_command(
4442
)
4543

4644
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/mixed_codim0.c)
47-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4846
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4947

5048
# Set C++20 standard
5149
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
50+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
5251

5352
# Do not throw error for 'multi-line comments' (these are typical in rst which
5453
# includes LaTeX)

‎cpp/demo/custom_kernel/CMakeLists.txt‎

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

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

1614
add_executable(${PROJECT_NAME} main.cpp)
17-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1816
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1917

2018
# Set C++20 standard
2119
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
20+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
2221

2322
# Do not throw error for 'multi-line comments' (these are typical in rst which
2423
# includes LaTeX)

‎cpp/demo/hyperelasticity/CMakeLists.txt‎

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

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

@@ -45,11 +43,12 @@ else()
4543
)
4644

4745
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/hyperelasticity.c)
48-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
46+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4947
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
5048

5149
# Set C++20 standard
5250
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
51+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
5352

5453
# Do not throw error for 'multi-line comments' (these are typical in rst which
5554
# includes LaTeX)

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

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

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

1614
add_executable(${PROJECT_NAME} main.cpp)
17-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1816
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1917

2018
# Set C++20 standard
2119
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
20+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
2221

2322
# Do not throw error for 'multi-line comments' (these are typical in rst which
2423
# includes LaTeX)

‎cpp/demo/interpolation_different_meshes/CMakeLists.txt‎

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

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

1614
add_executable(${PROJECT_NAME} main.cpp)
17-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
15+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
1816
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
1917

2018
# Set C++20 standard
2119
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
20+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
2221

2322
# Do not throw error for 'multi-line comments' (these are typical in rst which
2423
# includes LaTeX)

‎cpp/demo/mixed_poisson/CMakeLists.txt‎

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

10-
set(CMAKE_CXX_EXTENSIONS OFF)
11-
12-
if(NOT TARGET dolfinx)
10+
if(NOT TARGET dolfinx::dolfinx)
1311
find_package(DOLFINX REQUIRED)
1412
endif()
1513

@@ -44,11 +42,12 @@ add_custom_command(
4442
)
4543

4644
add_executable(${PROJECT_NAME} main.cpp ${CMAKE_CURRENT_BINARY_DIR}/mixed_poisson.c)
47-
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
45+
target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx::dolfinx)
4846
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
4947

5048
# Set C++20 standard
5149
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
50+
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
5251

5352
# Do not throw error for 'multi-line comments' (these are typical in rst which
5453
# includes LaTeX)

0 commit comments

Comments
 (0)