diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-13 15:12:14 +0100 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-13 15:18:40 +0100 |
commit | adb2fabf8da612b2e0747b32420b0258ec26895f (patch) | |
tree | 14ff736b968908828250acd6a7c54cf194238910 /pkgs/applications/graphics/freecad | |
parent | 6776756882e244f9fcd1eb018e515790e70374eb (diff) | |
download | nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar.gz nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar.bz2 nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar.lz nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar.xz nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.tar.zst nixlib-adb2fabf8da612b2e0747b32420b0258ec26895f.zip |
freecad: removing a patch not needed anymore
Diffstat (limited to 'pkgs/applications/graphics/freecad')
-rw-r--r-- | pkgs/applications/graphics/freecad/cmakeinstall.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/pkgs/applications/graphics/freecad/cmakeinstall.patch b/pkgs/applications/graphics/freecad/cmakeinstall.patch deleted file mode 100644 index 6b8f9fb1a60f..000000000000 --- a/pkgs/applications/graphics/freecad/cmakeinstall.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: src/3rdParty/salomesmesh/CMakeLists.txt -=================================================================== ---- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193) -+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy) -@@ -191,7 +191,7 @@ - INCLUDE_DIRECTORIES(src/StdMeshers) - - ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files}) --TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c) -+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran) - SET(StdMeshers_CFLAGS "") - IF(WIN32) - SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS") -@@ -218,9 +218,9 @@ - # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 - INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV - SMESHDS SMESH StdMeshers -- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME}) -+ DESTINATION lib) - # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 - INSTALL(DIRECTORY inc/ -- DESTINATION /usr/local/include/${INSTALL_PATH_NAME} -+ DESTINATION include - FILES_MATCHING PATTERN "*.h*") - ENDIF(UNIX) -Index: src/3rdParty/Pivy-0.5/CMakeLists.txt -=================================================================== ---- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193) -+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy) -@@ -56,6 +56,7 @@ - set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin") - set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy) - set_target_properties(coin PROPERTIES PREFIX "") -+ install(TARGETS coin DESTINATION bin/pivy) - endif(MSVC) - - fc_copy_sources_outpath("bin/pivy" "coin" -Index: CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt (revision 4193) -+++ a/CMakeLists.txt (working copy) -@@ -57,13 +57,6 @@ - - # ================================================================================ - -- --if(WIN32) -- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) --else(WIN32) -- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad") --endif(WIN32) -- - # ================================================================================ - # == Win32 is default behaviour use the LibPack copied in Source tree ============ - if(MSVC) |