1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
| | This patch just tweaks the cmake scripts to simplify the packaging.
Probably not worth contributing.
diff --git a/cmake/Linux.cmake b/cmake/Linux.cmake
index 0b6b9d7c4..cedc1b743 100644
--- a/cmake/Linux.cmake
+++ b/cmake/Linux.cmake
@@ -1,4 +1,3 @@
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-rpath=.")
set(PHARO_BIN_LOCATION "default" CACHE STRING "The default location of the PHARO bin, used by the launch.sh.in")
if(${PHARO_BIN_LOCATION} STREQUAL "default")
@@ -60,36 +59,29 @@ endmacro()
macro(configure_installables INSTALL_COMPONENT)
- set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/build/dist")
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packaging/linux/launch.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/build/packaging/linux/${VM_EXECUTABLE_NAME} @ONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packaging/linux/bin/launch.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/build/packaging/linux/bin/${VM_EXECUTABLE_NAME} @ONLY)
-
-
install(
- DIRECTORY "${CMAKE_BINARY_DIR}/build/packaging/linux/"
- DESTINATION "./"
+ DIRECTORY "${CMAKE_BINARY_DIR}/build/vm/"
+ DESTINATION "bin"
USE_SOURCE_PERMISSIONS
- COMPONENT ${INSTALL_COMPONENT})
+ COMPONENT ${INSTALL_COMPONENT}
+ FILES_MATCHING PATTERN pharo)
install(
DIRECTORY "${CMAKE_BINARY_DIR}/build/vm/"
DESTINATION "lib"
USE_SOURCE_PERMISSIONS
- COMPONENT ${INSTALL_COMPONENT})
- install(
- DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install/lib/"
- DESTINATION "lib"
- USE_SOURCE_PERMISSIONS
- COMPONENT ${INSTALL_COMPONENT}
- FILES_MATCHING PATTERN ${DYLIB_EXT})
-
-
- install(
- DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/unix/"
- DESTINATION include/pharovm
- COMPONENT include
- FILES_MATCHING PATTERN *.h)
+ COMPONENT ${INSTALL_COMPONENT}
+ FILES_MATCHING PATTERN *.so)
+ install(
+ DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install/lib/"
+ DESTINATION "lib"
+ USE_SOURCE_PERMISSIONS
+ COMPONENT ${INSTALL_COMPONENT}
+ FILES_MATCHING PATTERN ${DYLIB_EXT})
+ install(
+ DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/unix/"
+ DESTINATION include/pharovm
+ COMPONENT include
+ FILES_MATCHING PATTERN *.h)
endmacro()
macro(add_required_libs_per_platform)
diff --git a/macros.cmake b/macros.cmake
index 811e49687..53bb9133b 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -14,9 +14,6 @@ endmacro()
# Include a loose-dependency library in the project, but do not link it to the main library
macro(addIndependentLibraryWithRPATH NAME)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- set(CMAKE_INSTALL_RPATH ${PHARO_LIBRARY_PATH})
-
add_library(${NAME} SHARED ${ARGN})
set_target_properties(${NAME} PROPERTIES MACOSX_RPATH ON)
set_target_properties(${NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY})
|