Skip to content

Commit ef35a67

Browse files
committed
Move DeepSSMJob to Application library
1 parent 616c7ce commit ef35a67

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

Libs/Application/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
SET(APPLICATION_MOC_HDRS
2+
DeepSSM/DeepSSMJob.h
23
Job/Job.h
34
)
45

@@ -8,6 +9,7 @@ SET(Application_headers
89
)
910

1011
add_library(Application STATIC
12+
DeepSSM/DeepSSMJob.cpp
1113
Job/Job.cpp
1214
${APPLICATION_MOC_SRCS}
1315
)
@@ -16,10 +18,19 @@ target_include_directories(Application PUBLIC
1618
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1719
$<INSTALL_INTERFACE:include>)
1820

21+
set(SW_PYTHON_LIBS pybind11::embed)
22+
23+
if (APPLE)
24+
include_directories(${_Python3_INCLUDE_DIR})
25+
set(SW_PYTHON_LIBS "")
26+
endif(APPLE)
27+
1928
target_link_libraries(Application PUBLIC
29+
Groom
2030
Mesh
2131
Utils
2232
Particles
33+
${SW_PYTHON_LIBS}
2334
)
2435

2536
# set
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using namespace pybind11::literals; // to bring in the `_a` literal
1111
#include <QThread>
1212

1313
// shapeworks
14-
#include <DeepSSM/DeepSSMJob.h>
14+
#include "DeepSSMJob.h"
1515
#include <Project/DeepSSMParameters.h>
1616
#include <Groom.h>
1717
#include <Logging.h>

Studio/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,9 @@ SET(STUDIO_ANALYSIS_MOC_HDRS
157157

158158
SET(STUDIO_DEEPSSM_SRCS
159159
DeepSSM/DeepSSMTool.cpp
160-
DeepSSM/DeepSSMJob.cpp
161160
)
162161
SET(STUDIO_DEEPSSM_MOC_HDRS
163162
DeepSSM/DeepSSMTool.h
164-
DeepSSM/DeepSSMJob.h
165163
)
166164

167165

0 commit comments

Comments
 (0)