3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/graphics/freecad/cmakeinstall.patch
Lluís Batlle i Rossell f6ea68b2ee Freecad builds, installs and runs, (although still not with PyQt for its draft workbench).
On virtualgl, it needs a variable set about the GL context set; freecad
suggests that upon failing to run in that environment.

svn path=/nixpkgs/trunk/; revision=26153
2011-03-04 09:48:33 +00:00

56 lines
2.3 KiB
Diff

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)