blob: aae8d42e562d4e4813777c20b74910534e796319 (
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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a74201..56064a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,8 @@ include(setupOptions)
# We add libraries before setting up compilers because
# some of our options are incompatible with e.g. GC
if(USE_GC)
- add_subdirectory(libs/gc/gc)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ add_subdirectory(libs/gc/gc-7.2f)
endif()
#
diff --git a/cmake/ndifftests.cmake b/cmake/ndifftests.cmake
index 4d04afc..b0e2344 100644
--- a/cmake/ndifftests.cmake
+++ b/cmake/ndifftests.cmake
@@ -74,11 +74,6 @@ ndiff_test(test-thick-quad 0)
ndiff_test(test-thick-quad-2 0)
ndiff_test(test-thick-quad-3 0)
-if(USE_GC)
- ndiff_test(test-memory 1)
- set_tests_properties(test-memory_LONG PROPERTIES TIMEOUT 60)
-endif()
-
ndiff_test(test-survey-2 0)
ndiff_test(test-cororbit 1)
@@ -150,6 +145,7 @@ ndiff_test(test-table 0)
ndiff_test(test-line 0)
ndiff_test(test-memory 1)
+# set_tests_properties(test-memory_LONG PROPERTIES TIMEOUT 60)
ndiff_test(test-beam 0)
set_tests_properties(test-beam PROPERTIES WILL_FAIL 1)
diff --git a/cmake/setupOptions.cmake b/cmake/setupOptions.cmake
index b27ff09..743cf3e 100644
--- a/cmake/setupOptions.cmake
+++ b/cmake/setupOptions.cmake
@@ -68,7 +68,7 @@ if(MADX_NTPSA)
add_definitions("-D_NTPSA")
endif()
-option(USE_GC "Use Garbage Collector" OFF)
+option(USE_GC "Use Garbage Collector" ON)
if(USE_GC)
add_definitions("-D_USEGC")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b98b4fc..2cf346a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,7 @@ target_link_libraries(madx ${CMAKE_THREAD_LIBS_INIT} ${STDCPP_LIBS})
# Garbage collector:
if(USE_GC)
- include_directories(${CMAKE_SOURCE_DIR}/libs/gc/gc/include)
+ include_directories(${CMAKE_SOURCE_DIR}/libs/gc/gc-7.2f/include)
endif()
# Defining specific stuff for packaging:
|