- up to 1.2.0

[packages/avogadro.git] / avogadro-cmake.patch

diff --git a/avogadro-cmake.patch b/avogadro-cmake.patch
index 63f89049dcdab40d09e80dac8475579067a7abd1..91239b389336351de38c727d3aae9b76b2867eb2 100644 (file)
--- a/avogadro-cmake.patch
+++ b/avogadro-cmake.patch
@@ -1,18 +1,15 @@
 diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt
 --- avogadro-1.0.3/CMakeLists.txt      2011-04-25 07:29:58.000000000 +0200
 +++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt  2011-04-27 02:42:26.000000000 +0200
 diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt
 --- avogadro-1.0.3/CMakeLists.txt      2011-04-25 07:29:58.000000000 +0200
 +++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt  2011-04-27 02:42:26.000000000 +0200

-@@ -491,7 +491,7 @@
- if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
-     install(FILES
-       "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
--      DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
-+      DESTINATION "${QT_MKSPECS_DIR}/features"
-     )
- else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
-   message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.")
-diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-no-strip/CMakeLists.txt
---- avogadro-1.0.3/CMakeLists.txt      2011-04-25 07:29:58.000000000 +0200
-+++ avogadro-1.0.3-no-strip/CMakeLists.txt     2011-04-27 18:44:02.000000000 +0200
+@@ -95,8 +95,6 @@
+   if(NOT APPLE) # Mac GCC42 compiler has bug
+     check_cxx_compiler_flag(-fvisibility=hidden HAVE_GCC_VISIBILITY)
+     set(HAVE_GCC_VISIBILITY ${HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
+-    macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1)
+-    macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2)
+     set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE)
+     if (GCC_IS_NEWER_THAN_4_1)
+       exec_program(${CMAKE_C_COMPILER} ARGS -v OUTPUT_VARIABLE _gcc_alloc_info)

 @@ -98,7 +98,7 @@
        endif (NOT APPLE)
    # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
 @@ -98,7 +98,7 @@
        endif (NOT APPLE)
    # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,


@@ -22,3 +19,23 @@ diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-no-strip/CMakeLists.txt
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
    set(CMAKE_CXX_FLAGS_DEBUG   "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
    set(CMAKE_CXX_FLAGS_DEBUG   "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")

+@@ -491,7 +491,7 @@
+ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+     install(FILES
+       "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
+-      DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
++      DESTINATION "${QT_MKSPECS_DIR}/features"
+     )
+ else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+   message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.")
+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
+--- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt  2016-06-08 16:19:45.000000000 +0200
++++ avogadro-1.2.0.build/libavogadro/src/extensions/symmetry/libmsym/CMakeLists.txt    2017-04-13 11:58:44.627114834 +0200
+@@ -38,6 +38,7 @@
+ #        C_STANDARD_REQUIRED ON)
+ 
+ set_target_properties(msym PROPERTIES PUBLIC_HEADER "src/msym.h;src/msym_error.h")
++target_link_libraries(msym m)
+ 
+ export(TARGETS msym FILE "${PROJECT_BINARY_DIR}/libmsymTargets.cmake")
+