summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/pharo-vm-cmake.patch
blob: 100c92746da832164c579cc1fdb87b6b4cacc308 (plain)
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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
Upstream-status: <https://github.com/pharo-project/pharo-vm/pull/1003>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ec39df40..57f58f515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ option(DEPENDENCIES_FORCE_BUILD         "Force build libraries" OFF)
 option(BUILD_WITH_GRAPHVIZ              "Generate dependency graphs" ON)
 option(VERSION_UPDATE_FROM_GIT              "Extract version information from git tags. Default to true. Follow vX.Y.Z-suffix" TRUE)
 
+option(INSTALL_C_SOURCE "Install the generated C source files to `pharo-vm'" OFF)
 
 set(APPNAME			"Pharo"         CACHE STRING                 "VM Application name")
 set(FLAVOUR			"CoInterpreter" CACHE STRING                 "The kind of VM to generate. Possible values: StackVM, CoInterpreter")
@@ -105,6 +106,15 @@ endif()
 #This needs to be at this point, after setting the toolchain configuration
 project(PharoVM)
 
+set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib" CACHE STRING "Install-time RPATH")
+
+# Provide a default value for the installation prefix, while
+# preserving any user-specified CMAKE_INSTALL_PREFIX.
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE
+        "${CMAKE_CURRENT_BINARY_DIR}/build/dist")
+endif()
+
 include(cmake/versionExtraction.cmake)
 
 set(BUILT_FROM "${PharoVM_VERSION_STRING_FULL} - Commit: ${PharoVM_VERSION_GIT_SHA} - Date: ${PharoVM_VERSION_GIT_COMMIT_DATE}")
@@ -407,7 +417,12 @@ message(STATUS "C++ Compiler: ${CMAKE_CXX_COMPILER}")
 message(STATUS "Resource Compiler: ${CMAKE_RC_COMPILER}")
 
 set(VM_FRONTEND_APPLICATION_TYPE)
-include(cmake/${CMAKE_SYSTEM_NAME}.cmake)
+
+if(UNIX AND NOT OSX AND NOT WIN)
+    include(cmake/Linux.cmake)
+else()                          # WIN AND OSX
+    include(cmake/${CMAKE_SYSTEM_NAME}.cmake)
+endif()
 
 set(GENERATED_SOURCES ${VMSOURCEFILES})
 
diff --git a/cmake/Darwin.cmake b/cmake/Darwin.cmake
index 9095313d2..e1d1ab77c 100644
--- a/cmake/Darwin.cmake
+++ b/cmake/Darwin.cmake
@@ -67,8 +67,6 @@ macro(add_third_party_dependencies_per_platform)
 endmacro()
 
 macro(configure_installables INSTALL_COMPONENT)
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/build/dist")
-  
 	install(
 		DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install/lib/"
 		DESTINATION "${VM_EXECUTABLE_NAME}.app/Contents/MacOS/Plugins"
diff --git a/cmake/FreeBSD.cmake b/cmake/FreeBSD.cmake
deleted file mode 100644
index 0d4386657..000000000
--- a/cmake/FreeBSD.cmake
+++ /dev/null
@@ -1,97 +0,0 @@
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,wxneeded,-rpath=. -I/usr/local/include -I/usr/X11R6/include -lexecinfo")
-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")
-	set(PHARO_BIN_IN_ROOT "`/usr/bin/dirname \"\$0\"`/libexec")
-	set(PHARO_BIN_IN_BIN "`/usr/bin/dirname \"\$0\"`/../libexec")
-else()
-	set(PHARO_BIN_IN_ROOT ${PHARO_BIN_LOCATION})
-	set(PHARO_BIN_IN_BIN ${PHARO_BIN_LOCATION})
-endif()
-
-function(add_platform_headers)
-target_include_directories(${VM_LIBRARY_NAME}
-PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/unix
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/common
-)
-endfunction() #add_platform_headers
-
-set(EXTRACTED_SOURCES
-#Common sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqHeapMap.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqVirtualMachine.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqNamedPrims.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqExternalSemaphores.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqTicker.c
-
-#Platform sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/unix/aio.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/debugUnix.c
-
-#Virtual Memory functions
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryUnix.c
-
-# Support sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/fileDialogUnix.c
-)
-
-set(VM_FRONTEND_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/unixMain.c)
-
-
-macro(add_third_party_dependencies_per_platform)
-	if(${FEATURE_LIB_GIT2})
-        include(cmake/importLibGit2.cmake)
-    endif()
-
-    if(${FEATURE_LIB_FREETYPE2})
-        include(cmake/importFreetype2.cmake)
-    endif()
-
-    if(${FEATURE_LIB_CAIRO})
-        include(cmake/importCairo.cmake)
-    endif()
-
-    if(${FEATURE_LIB_SDL2})
-        include(cmake/importSDL2.cmake)
-    endif()
-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 "./"
-      USE_SOURCE_PERMISSIONS
-      COMPONENT ${INSTALL_COMPONENT})
-    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)
-endmacro()
-
-macro(add_required_libs_per_platform)
-  target_link_libraries(${VM_LIBRARY_NAME} m pthread)
-endmacro()
diff --git a/cmake/Linux.cmake b/cmake/Linux.cmake
index 0b6b9d7c4..fb43bae6b 100644
--- a/cmake/Linux.cmake
+++ b/cmake/Linux.cmake
@@ -1,14 +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")
-	set(PHARO_BIN_IN_ROOT "`/usr/bin/dirname \"\$0\"`/lib")
-	set(PHARO_BIN_IN_BIN "`/usr/bin/dirname \"\$0\"`/../lib")
-else()
-	set(PHARO_BIN_IN_ROOT ${PHARO_BIN_LOCATION})
-	set(PHARO_BIN_IN_BIN ${PHARO_BIN_LOCATION})
-endif()
-
 function(add_platform_headers)
 target_include_directories(${VM_LIBRARY_NAME}
 PUBLIC
@@ -39,7 +28,6 @@ set(EXTRACTED_SOURCES
 set(VM_FRONTEND_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/unixMain.c)
 
-
 macro(add_third_party_dependencies_per_platform)
 	if(${FEATURE_LIB_GIT2})
         include(cmake/importLibGit2.cmake)
@@ -58,42 +46,21 @@ macro(add_third_party_dependencies_per_platform)
     endif()
 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 "./"
-      USE_SOURCE_PERMISSIONS
-      COMPONENT ${INSTALL_COMPONENT})
+        TARGETS ${VM_EXECUTABLE_NAME}
+        COMPONENT ${INSTALL_COMPONENT})
     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)
+        TARGETS ${VM_LIBRARY_NAME}
+        COMPONENT ${INSTALL_COMPONENT}
+        INCLUDES DESTINATION "include/pharovm")
+    install(
+        TARGETS ${VM_PLUGIN_TARGETS}
+        COMPONENT ${INSTALL_COMPONENT})
 endmacro()
 
 macro(add_required_libs_per_platform)
   target_link_libraries(${VM_LIBRARY_NAME} dl)
   target_link_libraries(${VM_LIBRARY_NAME} m)
   target_link_libraries(${VM_LIBRARY_NAME} pthread)
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/cmake/OpenBSD.cmake b/cmake/OpenBSD.cmake
deleted file mode 100644
index 19d26483b..000000000
--- a/cmake/OpenBSD.cmake
+++ /dev/null
@@ -1,97 +0,0 @@
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,wxneeded,-rpath=. -I/usr/local/include -I/usr/X11R6/include")
-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")
-	set(PHARO_BIN_IN_ROOT "`/usr/bin/dirname \"\$0\"`/lib")
-	set(PHARO_BIN_IN_BIN "`/usr/bin/dirname \"\$0\"`/../lib")
-else()
-	set(PHARO_BIN_IN_ROOT ${PHARO_BIN_LOCATION})
-	set(PHARO_BIN_IN_BIN ${PHARO_BIN_LOCATION})
-endif()
-
-function(add_platform_headers)
-target_include_directories(${VM_LIBRARY_NAME}
-PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/unix
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/include/common
-)
-endfunction() #add_platform_headers
-
-set(EXTRACTED_SOURCES
-#Common sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqHeapMap.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqVirtualMachine.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqNamedPrims.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqExternalSemaphores.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/common/sqTicker.c
-
-#Platform sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/extracted/vm/src/unix/aio.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/debugUnix.c
-
-#Virtual Memory functions
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryUnix.c
-
-# Support sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/fileDialogUnix.c
-)
-
-set(VM_FRONTEND_SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/unixMain.c)
-
-
-macro(add_third_party_dependencies_per_platform)
-	if(${FEATURE_LIB_GIT2})
-        include(cmake/importLibGit2.cmake)
-    endif()
-
-    if(${FEATURE_LIB_FREETYPE2})
-        include(cmake/importFreetype2.cmake)
-    endif()
-
-    if(${FEATURE_LIB_CAIRO})
-        include(cmake/importCairo.cmake)
-    endif()
-
-    if(${FEATURE_LIB_SDL2})
-        include(cmake/importSDL2.cmake)
-    endif()
-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 "./"
-      USE_SOURCE_PERMISSIONS
-      COMPONENT ${INSTALL_COMPONENT})
-    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)
-endmacro()
-
-macro(add_required_libs_per_platform)
-  target_link_libraries(${VM_LIBRARY_NAME} m pthread)
-endmacro()
diff --git a/cmake/Windows.cmake b/cmake/Windows.cmake
index 3082b697c..9be884ebc 100644
--- a/cmake/Windows.cmake
+++ b/cmake/Windows.cmake
@@ -98,8 +98,6 @@ macro(add_third_party_dependencies_per_platform)
 endmacro()
 
 macro(configure_installables INSTALL_COMPONENT)
-    set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/build/dist")
-
     install(
           DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build/vm/"
           DESTINATION "./"
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index 4727d56e0..54add1eb4 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -30,54 +30,52 @@ install(
     COMPONENT include
     FILES_MATCHING PATTERN *.h)
 
-install(DIRECTORY
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-    "${CMAKE_CURRENT_SOURCE_DIR}/extracted"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/packaging"
-    "${CMAKE_CURRENT_SOURCE_DIR}/plugins"
-    "${CMAKE_CURRENT_SOURCE_DIR}/resources"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ffiTestLibrary"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ffi"
-    "${CMAKE_CURRENT_SOURCE_DIR}/tty"
-    DESTINATION pharo-vm
-    USE_SOURCE_PERMISSIONS
-    COMPONENT c-src
-)
-
-install(FILES
+if(INSTALL_C_SOURCE)
+    install(DIRECTORY
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+        "${CMAKE_CURRENT_SOURCE_DIR}/extracted"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include"
+        "${CMAKE_CURRENT_SOURCE_DIR}/plugins"
+        "${CMAKE_CURRENT_SOURCE_DIR}/resources"
+        "${CMAKE_CURRENT_SOURCE_DIR}/scripts"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src"
+        "${CMAKE_CURRENT_SOURCE_DIR}/ffiTestLibrary"
+        "${CMAKE_CURRENT_SOURCE_DIR}/ffi"
+        "${CMAKE_CURRENT_SOURCE_DIR}/tty"
+        DESTINATION pharo-vm
+        USE_SOURCE_PERMISSIONS
+        COMPONENT c-src)
+
+    install(FILES
 	"${CMAKE_CURRENT_BINARY_DIR}/version.info"
 	DESTINATION pharo-vm
 	COMPONENT c-src)
 
+    install(FILES
+        "CMakeLists.txt"
+        ${SUPPORT_CMAKE_FILES}
+        DESTINATION pharo-vm
+        COMPONENT c-src)
+
+    #Define generated files as elements in the c-src component for packaging
+    install(
+        DIRECTORY "${GENERATED_SOURCE_DIR}/generated/"
+        DESTINATION pharo-vm/generated/
+        USE_SOURCE_PERMISSIONS
+        COMPONENT c-src)
+
+    install(
+        DIRECTORY "${GENERATED_SOURCE_DIR}/generated/32/vm/include/"
+        DESTINATION include/pharovm
+        USE_SOURCE_PERMISSIONS
+        COMPONENT include
+        FILES_MATCHING PATTERN *.h)
+endif(INSTALL_C_SOURCE)
+
 #List all cmake files
 file(GLOB SUPPORT_CMAKE_FILES
   "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake"
 )
-
-install(FILES
-    "CMakeLists.txt"
-    ${SUPPORT_CMAKE_FILES}
-    DESTINATION pharo-vm
-    COMPONENT c-src
-)
-
-#Define generated files as elements in the c-src component for packaging
-install(
-	DIRECTORY "${GENERATED_SOURCE_DIR}/generated/"
-	DESTINATION pharo-vm/generated/
-	USE_SOURCE_PERMISSIONS
-	COMPONENT c-src)
-
-install(
-	DIRECTORY "${GENERATED_SOURCE_DIR}/generated/32/vm/include/"
-	DESTINATION include/pharovm
-	USE_SOURCE_PERMISSIONS
-	COMPONENT include
-	FILES_MATCHING PATTERN *.h)
-
 set(CPACK_PACKAGE_DESCRIPTION "${APPNAME} Headless VM for ${FULL_PLATFORM_NAME}")
 set(CPACK_PACKAGE_VENDOR "${APPNAME}")
 set(CPACK_PACKAGE_HOMEPAGE_URL "https://pharo.org")
diff --git a/packaging/linux/bin/launch.sh.in b/packaging/linux/bin/launch.sh.in
deleted file mode 100755
index 0d7d656bb..000000000
--- a/packaging/linux/bin/launch.sh.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
-# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
-BIN=@PHARO_BIN_IN_BIN@
-GDB=
-if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
-    export SQUEAK_PLUGINS="$BIN"
-fi
-if [ "$1" = '-gdb' ]; then
-    GDB=gdb
-    shift
-    echo;echo run $@; echo
-    set --
-fi
-# At least on linux LD_LIBRARY_PATH's components must be absolute path names
-case "$BIN" in
-/*) PLUGINS="$BIN";;
-*) PLUGINS="`pwd`/$BIN"
-esac
-
-if [ $(uname -s) = "OpenBSD" ]; then
-  LD_LIBRARY_PATH="$PLUGINS:${LD_LIBRARY_PATH}" exec $GDB "$BIN/@VM_EXECUTABLE_NAME@" "$@"
-fi
-
-# On some linuxes there multiple versions of the C library.  If the image uses
-# libc (e.g. through the FFI) then it must use the same version that the VM uses
-# and so it should take precedence over /lib libc.  This is done by setting
-# LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
-#Try extracting Libc
-LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
-PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
-
-#If empty try extracting Musl
-if [ "$PLATFORMLIBDIR" = "" ]; then
-{
-	LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
-	PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/ld-musl.*'`
-}
-fi
-
-if [ "$PLATFORMLIBDIR" = "" ]; then
-{
-    echo "Error. Could not determine platform's libc path for VM. "
-    echo "Try forcing \$PLATFORMLIBDIR in $0, based on LIBC_SO."
-    echo "Please report what works to @VM_EXECUTABLE_NAME@ [vm-dev] mail list."
-    echo "  LIBC_SO="$LIBC_SO
-    cat /etc/*-release*  |  grep -v // | sed 's/^/  /'
-    echo -n "  UNAME=" ; uname -a
-    MACHINE=`uname -m`
-    case "$MACHINE" in
-        *64*)
-            echo "  System seems to be 64 bit. You may need to (re)install the 32-bit libraries."
-            ;;
-    esac
-    exit 1
-} 1>&2
-fi
-# prepending is less flexible but safer because it ensures we find the plugins
-# in the same directory as the VM.  We must include at least /lib and /usr/lib
-# if libraries there-in are to be found.  These directories are not implicit.
-case $PLATFORMLIBDIR in
-/lib|/usr/lib)  SVMLLP=/lib:/usr/lib;;
-*)              SVMLLP="$PLATFORMLIBDIR:/lib:/usr$PLATFORMLIBDIR:/usr/lib"
-esac
-LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec $GDB "$BIN/@VM_EXECUTABLE_NAME@" "$@"
diff --git a/packaging/linux/launch.sh.in b/packaging/linux/launch.sh.in
deleted file mode 100755
index 456444f27..000000000
--- a/packaging/linux/launch.sh.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
-# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
-BIN=@PHARO_BIN_IN_ROOT@
-GDB=
-if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
-    export SQUEAK_PLUGINS="$BIN"
-fi
-if [ "$1" = '-gdb' ]; then
-    GDB=gdb
-    shift
-    echo;echo run $@; echo
-    set --
-fi
-# At least on linux LD_LIBRARY_PATH's components must be absolute path names
-case "$BIN" in
-/*) PLUGINS="$BIN";;
-*) PLUGINS="`pwd`/$BIN"
-esac
-
-if [ $(uname -s) = "OpenBSD" ]; then
-  LD_LIBRARY_PATH="$PLUGINS:${LD_LIBRARY_PATH}" exec $GDB "$BIN/@VM_EXECUTABLE_NAME@" "$@"
-fi
-
-# On some linuxes there multiple versions of the C library.  If the image uses
-# libc (e.g. through the FFI) then it must use the same version that the VM uses
-# and so it should take precedence over /lib libc.  This is done by setting
-# LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
-
-#Try extracting Libc
-LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
-PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
-
-#If empty try extracting Musl
-if [ "$PLATFORMLIBDIR" = "" ]; then
-{
-	LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
-	PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/ld-musl.*'`
-}
-fi
-
-if [ "$PLATFORMLIBDIR" = "" ]; then
-{
-    echo "Error. Could not determine platform's libc path for VM. "
-    echo "Try forcing \$PLATFORMLIBDIR in $0, based on LIBC_SO."
-    echo "Please report what works to @VM_EXECUTABLE_NAME@ [vm-dev] mail list."
-    echo "  LIBC_SO="$LIBC_SO
-    cat /etc/*-release*  |  grep -v // | sed 's/^/  /'
-    echo -n "  UNAME=" ; uname -a
-    MACHINE=`uname -m`
-    case "$MACHINE" in
-        *64*)
-            echo "  System seems to be 64 bit. You may need to (re)install the 32-bit libraries."
-            ;;
-    esac
-    exit 1
-} 1>&2
-fi
-# prepending is less flexible but safer because it ensures we find the plugins
-# in the same directory as the VM.  We must include at least /lib and /usr/lib
-# if libraries there-in are to be found.  These directories are not implicit.
-case $PLATFORMLIBDIR in
-/lib|/usr/lib)  SVMLLP=/lib:/usr/lib;;
-*)              SVMLLP="$PLATFORMLIBDIR:/lib:/usr$PLATFORMLIBDIR:/usr/lib"
-esac
-LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec $GDB "$BIN/@VM_EXECUTABLE_NAME@" "$@"
diff --git a/plugins.cmake b/plugins.cmake
index 5be40233c..809c55631 100644
--- a/plugins.cmake
+++ b/plugins.cmake
@@ -47,6 +47,7 @@ endif()
 addLibraryWithRPATH(FilePlugin
     ${FilePlugin_SOURCES}
     ${PHARO_CURRENT_GENERATED}/plugins/src/FilePlugin/FilePlugin.c)
+list(APPEND VM_PLUGIN_TARGETS FilePlugin)
 
 if(OSX)
     target_link_libraries(FilePlugin PRIVATE "-framework CoreFoundation")
@@ -75,6 +76,7 @@ if(NOT OPENBSD)
     )
 
     addLibraryWithRPATH(UUIDPlugin ${UUIDPlugin_SOURCES})
+    list(APPEND VM_PLUGIN_TARGETS UUIDPlugin)
     if(WIN)
         target_link_libraries(UUIDPlugin PRIVATE "-lole32")
     elseif(UNIX AND NOT OSX)
@@ -147,6 +149,7 @@ set(BitBltPlugin_SOURCES
 )
 
 addLibraryWithRPATH(BitBltPlugin ${BitBltPlugin_SOURCES})
+list(APPEND VM_PLUGIN_TARGETS BitBltPlugin)
 
 #
 # B2DPlugin
@@ -193,6 +196,7 @@ else()
 endif()
 
 addLibraryWithRPATH(LocalePlugin ${LocalePlugin_SOURCES})
+list(APPEND VM_PLUGIN_TARGETS LocalePlugin)
 
 if(OSX)
 	target_link_libraries(LocalePlugin PRIVATE "-framework CoreFoundation")
@@ -239,6 +243,7 @@ else()
 endif()
 
 addLibraryWithRPATH(SqueakSSL ${SqueakSSL_SOURCES})
+list(APPEND VM_PLUGIN_TARGETS SqueakSSL)
 
 if(OSX)
     target_link_libraries(SqueakSSL PRIVATE "-framework CoreFoundation")
diff --git a/plugins.macros.cmake b/plugins.macros.cmake
index 8e7ff93c0..e68780cc3 100644
--- a/plugins.macros.cmake
+++ b/plugins.macros.cmake
@@ -1,3 +1,6 @@
+# The list of VM_PLUGINS targets define.
+set(VM_PLUGIN_TARGETS)
+
 macro(add_vm_plugin NAME)
 
     set(${NAME}_SOURCES_EXTRA ${ARGN})
@@ -36,4 +39,5 @@ macro(add_vm_plugin NAME)
     message(STATUS "Adding plugin: ${NAME}")    
 
     addLibraryWithRPATH(${NAME} ${${NAME}_SOURCES} ${${NAME}_SOURCES_EXTRA})
-endmacro()
\ No newline at end of file
+    list(APPEND VM_PLUGIN_TARGETS ${NAME})
+endmacro()