- up to 1.2.0
[packages/avogadro.git] / avogadro-cmake.patch
1 diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt
2 --- avogadro-1.0.3/CMakeLists.txt       2011-04-25 07:29:58.000000000 +0200
3 +++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt   2011-04-27 02:42:26.000000000 +0200
4 @@ -95,8 +95,6 @@
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)
13 @@ -98,7 +98,7 @@
14         endif (NOT APPLE)
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}")
22 @@ -491,7 +491,7 @@
23  if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
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      )
29  else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
30    message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.")
31 diff -ur avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt avogadro-1.2.0.build/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt
32 --- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt   2016-06-08 16:19:45.000000000 +0200
33 +++ avogadro-1.2.0.build/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt     2017-04-13 11:58:44.627114834 +0200
34 @@ -38,6 +38,7 @@
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  
This page took 1.588671 seconds and 3 git commands to generate.