kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'refs/heads/master' into review-CL-Bundler

Browse Source 
Conflicts:
	src/3rdParty/salomesmesh/CMakeLists.txt
This commit is contained in:
jriegel
2014-11-22 13:51:04 +01:00
parent 6483c66cba c5f2e9e56b
commit 1bc6df8eac
26 changed files with 431 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@@ -9,13 +9,13 @@ SET(SMESH_VERSION_TWEAK 2)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
include_directories(
inc
src/SMDS
src/Driver
src/DriverUNV
src/DriverDAT
src/DriverSTL
src/StdMeshers
inc
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
@@ -23,6 +23,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${NGLIB_INCLUDE_DIR}
${NETGEN_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})