45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
Index: src/3rdParty/salomesmesh/CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193)
|
||
|
|
+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy)
|
||
|
|
@@ -206,21 +206,3 @@
|
||
|
|
IF(MINGW)
|
||
|
|
SET_TARGET_PROPERTIES(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||
|
|
ENDIF(MINGW)
|
||
|
|
-
|
||
|
|
-###########
|
||
|
|
-# INSTALL #
|
||
|
|
-###########
|
||
|
|
-
|
||
|
|
-# Path name install: for instance, SMESH-5.1.2.7
|
||
|
|
-SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK})
|
||
|
|
-
|
||
|
|
-IF(UNIX)
|
||
|
|
- # 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})
|
||
|
|
- # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
|
||
|
|
- INSTALL(DIRECTORY inc/
|
||
|
|
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
|
||
|
|
- FILES_MATCHING PATTERN "*.h*")
|
||
|
|
-ENDIF(UNIX)
|
||
|
|
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)
|