diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt index e9fe130b2eb00b57b5dd6be7f6e0e70b8087baf6..2e44ec2997fda407112e0842e6ded8d964c8e10b 100644 --- a/Applications/CLI/CMakeLists.txt +++ b/Applications/CLI/CMakeLists.txt @@ -1,4 +1,4 @@ -if(OGS_USE_PYTHON AND NOT OGS_WHEEL_BUILD) +if(OGS_USE_PYTHON AND NOT OGS_BUILD_WHEEL) # Troubleshooting: If you get linker errors, such as ogs.cpp:(.text+0xb4): # undefined reference to `_Py_ZeroStruct' it could be that OGS is compiled # with the wrong Python version. I (Ch. Leh.) observed the following: The @@ -48,7 +48,7 @@ if(OGS_USE_PYTHON AND NOT OGS_WHEEL_BUILD) ) endif() -if(NOT OGS_WHEEL_BUILD) +if(NOT OGS_BUILD_WHEEL) ogs_add_executable(ogs ogs.cpp CommandLineArgumentParser.cpp) target_link_libraries( diff --git a/CMakeLists.txt b/CMakeLists.txt index 88d392ab0f75b8a653e2b4435fa2acf1ab04730e..68714ee21a16edcde774840106b4744fcad634ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(OGS-6) option(OGS_USE_PYTHON "Interface with Python" ON) option(OGS_BUILD_PYTHON_MODULE "Should the OGS Python module be built?" ON) -option(OGS_WHEEL_BUILD "Build Python wheels of OGS" OFF) +option(OGS_BUILD_WHEEL "Build Python wheels of OGS" OFF) include(CMakeDependentOption) include(scripts/cmake/UseCompilerCache.cmake) diff --git a/CMakePresets.json b/CMakePresets.json index 67c0c66361e043e0630f43c3929ae1f50d3baa9d..ff3d11d58f028cbe634335fda86a3056d2940002 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -197,7 +197,7 @@ "OGS_BUILD_HDF5": "ON", "OGS_USE_PYTHON": "ON", "OGS_BUILD_PYTHON_MODULE": "ON", - "OGS_WHEEL_BUILD": "ON", + "OGS_BUILD_WHEEL": "ON", "OGS_BUILD_TESTING": "OFF", "OGS_INSTALL_DEPENDENCIES": "OFF", "OGS_USE_PIP": "OFF", diff --git a/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt b/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt index 629333554a777e722b20a12ba774b41bc5117b20..eac165877cfe05ef07576d594da54a1776d507c3 100644 --- a/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt +++ b/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt @@ -44,10 +44,10 @@ target_include_directories( target_link_libraries( ProcessLibBoundaryConditionAndSourceTermPython PUBLIC BaseLib MathLib MeshLib NumLib - $<IF:$<BOOL:${OGS_WHEEL_BUILD}>,pybind11::module,pybind11::embed> + $<IF:$<BOOL:${OGS_BUILD_WHEEL}>,pybind11::module,pybind11::embed> ) -if(OGS_WHEEL_BUILD) +if(OGS_BUILD_WHEEL) target_link_options( ProcessLibBoundaryConditionAndSourceTermPython PUBLIC $<$<CXX_COMPILER_ID:AppleClang>:-undefined dynamic_lookup> diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 83b27a73b72b2e0331939c13c82428c3c4f17285..5948eab753b090fb3d11e1f7b69d0c0937baef5a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -24,7 +24,7 @@ append_source_files(TEST_SOURCES GeoLib/IO) append_source_files(TEST_SOURCES MaterialLib) append_source_files(TEST_SOURCES MathLib) append_source_files(TEST_SOURCES MeshLib) -if(NOT OGS_WHEEL_BUILD) +if(NOT OGS_BUILD_WHEEL) append_source_files(TEST_SOURCES ApplicationsLib) endif() append_source_files(TEST_SOURCES MeshGeoToolsLib) @@ -37,7 +37,7 @@ set_source_files_properties( set(TEST_SOURCES ${TEST_SOURCES} ${TEST_SOURCES_NUMLIB}) append_source_files(TEST_SOURCES ParameterLib) -if(NOT OGS_WHEEL_BUILD) +if(NOT OGS_BUILD_WHEEL) append_source_files(TEST_SOURCES ProcessLib) if(OGS_BUILD_PROCESS_TH2M) append_source_files(TEST_SOURCES ProcessLib/TH2M) @@ -72,7 +72,7 @@ ogs_add_executable(testrunner ${TEST_SOURCES}) target_link_libraries( testrunner - PRIVATE $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:ApplicationsLib> + PRIVATE $<$<NOT:$<BOOL:${OGS_BUILD_WHEEL}>>:ApplicationsLib> ApplicationsFileIO autocheck gmock @@ -83,8 +83,8 @@ target_link_libraries( MeshLib NumLib ParameterLib - $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:ProcessLib> - $<$<NOT:$<BOOL:${OGS_WHEEL_BUILD}>>:Processes> + $<$<NOT:$<BOOL:${OGS_BUILD_WHEEL}>>:ProcessLib> + $<$<NOT:$<BOOL:${OGS_BUILD_WHEEL}>>:Processes> TestInfoLib VTK::FiltersGeneral VTK::FiltersSources diff --git a/scripts/cmake/PythonSetup.cmake b/scripts/cmake/PythonSetup.cmake index 95e3fedcc3179416fdd2bb0b3b2ae0f3da3ab592..ffaabcfaa74cc9a880752c18142e43506f9f2536 100644 --- a/scripts/cmake/PythonSetup.cmake +++ b/scripts/cmake/PythonSetup.cmake @@ -40,7 +40,7 @@ else() endif() set(_python_componets Interpreter) -if(OGS_USE_PYTHON AND NOT OGS_WHEEL_BUILD) +if(OGS_USE_PYTHON AND NOT OGS_BUILD_WHEEL) list(APPEND _python_componets Development.Embed) endif() if(OGS_BUILD_PYTHON_MODULE) diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake index ae910e3e878b12c99141c84ff54340ff969928e0..31e766979cb294bf06aab4b5e8e0bc96d2c570f0 100644 --- a/scripts/cmake/test/OgsTest.cmake +++ b/scripts/cmake/test/OgsTest.cmake @@ -4,7 +4,7 @@ function(OgsTest) return() endif() - if (OGS_WHEEL_BUILD) + if(OGS_BUILD_WHEEL) return() endif()