File tree Expand file tree Collapse file tree 2 files changed +1
-15
lines changed Expand file tree Collapse file tree 2 files changed +1
-15
lines changed Original file line number Diff line number Diff line change 9
9
cmake_minimum_required (VERSION 3.8)
10
10
project (xwidgets)
11
11
12
- if (EMSCRIPTEN)
13
- set_property (GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE )
14
- set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-s SIDE_MODULE=1" )
15
- set (CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-s SIDE_MODULE=1" )
16
- set (CMAKE_STRIP FALSE )
17
-
18
- # Define the path to the shared library for use with CppInterOp dynamic loading
19
- set (XWIDGETS_CPPINTEROP_LIBRARY_PATH "\" /lib/${CMAKE_SHARED_LIBRARY_PREFIX} xwidgets${CMAKE_SHARED_LIBRARY_SUFFIX} \" " )
20
- message (STATUS "XWIDGETS_CPPINTEROP_LIBRARY_PATH = ${XWIDGETS_CPPINTEROP_LIBRARY_PATH} " )
21
- endif ()
22
-
23
12
set (XWIDGETS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /include )
24
13
set (XWIDGETS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /src)
25
14
@@ -168,9 +157,6 @@ macro(xwidgets_create_target target_name linkage output_name)
168
157
)
169
158
170
159
target_link_libraries (${target_name} PUBLIC ${XEUS_TARGET_NAME} xproperty)
171
- if (EMSCRIPTEN)
172
- set_target_properties (${target_name} PROPERTIES NO_SONAME 1)
173
- endif ()
174
160
175
161
set_target_properties (
176
162
${target_name}
Original file line number Diff line number Diff line change 18
18
19
19
#include <clang/Interpreter/CppInterOp.h>
20
20
static bool _xwidgets_loaded = []() {
21
- Cpp::LoadLibrary(@XWIDGETS_CPPINTEROP_LIBRARY_PATH@ , false);
21
+ Cpp::LoadLibrary("/lib/@CMAKE_SHARED_LIBRARY_PREFIX@xwidgets@CMAKE_SHARED_LIBRARY_SUFFIX@" , false);
22
22
return true;
23
23
}();
24
24
You can’t perform that action at this time.
0 commit comments