Skip to content

Commit bfdb87d

Browse files
Merge pull request #490 from easifem/dev
Updates in CMakeFiles
2 parents 6585f7a + afda6e5 commit bfdb87d

File tree

2 files changed

+23
-47
lines changed

2 files changed

+23
-47
lines changed

cmake/Modules/FindGmsh.cmake

Lines changed: 0 additions & 39 deletions
This file was deleted.

cmake/addGmsh.cmake

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,31 @@
1616

1717
option(USE_GMSH_SDK OFF)
1818
if(USE_GMSH_SDK)
19+
20+
# download the python virtual env
21+
1922
message(STATUS "USING GMSH SDK")
23+
message(STATUS "Making Python Virtual Environment")
2024
list(APPEND TARGET_COMPILE_DEF "-DUSE_GMSH_SDK")
21-
find_package(Gmsh REQUIRED)
22-
if(GMSH_FOUND)
23-
message(STATUS "FOUND Gmsh")
24-
message(STATUS "GMSH_LIBRARIES : ${GMSH_LIB}")
25-
target_link_libraries(${PROJECT_NAME} PUBLIC ${GMSH_LIB})
26-
else()
27-
message(STATUS "NOT FOUND Gmsh")
28-
endif()
25+
26+
find_package(Python3 REQUIRED COMPONENTS Interpreter)
27+
set(PY_VENV "${CMAKE_INSTALL_PREFIX}/gmsh")
28+
set(PY_BIN_DIR "${PY_VENV}/bin")
29+
set(GMSH_LIBRARIES "${PY_VENV}/lib/libgmsh.so")
30+
31+
install(
32+
CODE "
33+
MESSAGE(\"Creating PY_VENV from ${Python3_EXECUTABLE} to ${PY_VENV}\")
34+
execute_process(COMMAND_ECHO STDOUT COMMAND ${Python3_EXECUTABLE} -m venv ${PY_VENV} )
35+
execute_process(COMMAND_ECHO STDOUT COMMAND ${PY_BIN_DIR}/pip install --upgrade gmsh )
36+
")
37+
38+
# find_library(GMSH_LIBRARIES NAME gmsh HINTS "${PY_VENV}/lib" REQUIRED)
39+
target_link_libraries(${PROJECT_NAME} INTERFACE ${GMSH_LIBRARIES})
40+
message(STATUS "GMSH_LIBRARIES : ${GMSH_LIBRARIES}")
41+
2942
else()
43+
3044
message(STATUS "NOT USING GMSH SDK")
45+
3146
endif()

0 commit comments

Comments
 (0)