Skip to content

Commit cc51078

Browse files
committed
remove cmake changes
1 parent e876931 commit cc51078

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
cmake_minimum_required(VERSION 3.8)
1010
project(xwidgets)
1111

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-
2312
set(XWIDGETS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
2413
set(XWIDGETS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
2514

@@ -168,9 +157,6 @@ macro(xwidgets_create_target target_name linkage output_name)
168157
)
169158

170159
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()
174160

175161
set_target_properties(
176162
${target_name}

include/xwidgets/xwidgets_config_cling.hpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <clang/Interpreter/CppInterOp.h>
2020
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);
2222
return true;
2323
}();
2424

0 commit comments

Comments
 (0)