]>
Commit | Line | Data |
---|---|---|
e522f7bb JR |
1 | diff -urNp -x '*.orig' avogadro-1.2.0.org/CMakeLists.txt avogadro-1.2.0/CMakeLists.txt |
2 | --- avogadro-1.2.0.org/CMakeLists.txt 2016-06-08 16:19:45.000000000 +0200 | |
3 | +++ avogadro-1.2.0/CMakeLists.txt 2021-08-17 17:23:31.247260410 +0200 | |
4 | @@ -95,8 +95,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) | |
43ce3cb8 JR |
5 | if(NOT APPLE) # Mac GCC42 compiler has bug |
6 | check_cxx_compiler_flag(-fvisibility=hidden HAVE_GCC_VISIBILITY) | |
7 | set(HAVE_GCC_VISIBILITY ${HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") | |
8 | - macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) | |
9 | - macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) | |
10 | set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) | |
11 | if (GCC_IS_NEWER_THAN_4_1) | |
12 | exec_program(${CMAKE_C_COMPILER} ARGS -v OUTPUT_VARIABLE _gcc_alloc_info) | |
e522f7bb JR |
13 | @@ -114,7 +112,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) |
14 | endif() | |
ee72a804 AM |
15 | # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS, |
16 | # they will not replace them. | |
17 | - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") | |
18 | + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT") | |
19 | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO | |
20 | "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}") | |
21 | set(CMAKE_CXX_FLAGS_DEBUG "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}") | |
e522f7bb JR |
22 | @@ -552,7 +550,7 @@ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF) |
23 | # ) | |
43ce3cb8 JR |
24 | install(FILES |
25 | "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf" | |
26 | - DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features" | |
27 | + DESTINATION "${QT_MKSPECS_DIR}/features" | |
28 | ) | |
e522f7bb JR |
29 | # endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/") |
30 | else() | |
31 | diff -urNp -x '*.orig' avogadro-1.2.0.org/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt | |
32 | --- avogadro-1.2.0.org/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt 2016-06-08 16:19:45.000000000 +0200 | |
33 | +++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt 2021-08-17 17:23:31.247260410 +0200 | |
34 | @@ -38,6 +38,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -st | |
43ce3cb8 JR |
35 | # C_STANDARD_REQUIRED ON) |
36 | ||
37 | set_target_properties(msym PROPERTIES PUBLIC_HEADER "src/msym.h;src/msym_error.h") | |
38 | +target_link_libraries(msym m) | |
39 | ||
40 | export(TARGETS msym FILE "${PROJECT_BINARY_DIR}/libmsymTargets.cmake") | |
41 |