diff -rupN engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/CMakeLists.txt engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/CMakeLists.txt
--- engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/CMakeLists.txt 2015-03-17 20:09:35.000000000 +0100
+++ engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/CMakeLists.txt 2015-03-23 21:01:00.789079685 +0100
@@ -34,21 +34,10 @@ set(ENGRID_MINOR_VERSION 0)
set(ENGRID_PATCH_VERSION 0)
set(ENGRID_VERSION ${ENGRID_MAJOR_VERSION}.${ENGRID_MINOR_VERSION}.${ENGRID_PATCH_VERSION})
-exec_program(
- "git"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ARGS "describe"
- OUTPUT_VARIABLE GIT_SHA1)
-string(REGEX MATCH "-g.*$" GIT_SHA1 ${GIT_SHA1})
-string(REGEX REPLACE "[-g]" "" GIT_SHA1 ${GIT_SHA1} )
-add_definitions( -DGIT_SHA1="${GIT_SHA1}" )
-exec_program(
- "git"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ARGS "symbolic-ref --short HEAD"
- OUTPUT_VARIABLE GIT_BRANCH)
-add_definitions( -DGIT_BRANCH="${GIT_BRANCH}" )
+set(GIT_SHA1 "" CACHE STRING "GIT SHA")
+add_definitions( -DGIT_SHA1="${GIT_SHA1}" )
+add_definitions( -DGIT_BRANCH="master" )
FIND_PACKAGE(VTK REQUIRED)
include(${VTK_USE_FILE})
@@ -69,7 +58,6 @@ include_directories(${QT_QTGUI_INCLUDE_D
include_directories(${QT_QTXML_INCLUDE_DIR})
# set include directory, add src directories
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tetgen)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libengrid)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/libengrid)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -88,7 +76,6 @@ else()
add_definitions(-DQT_DEBUG)
endif()
-add_subdirectory(tetgen)
add_subdirectory(libengrid)
add_executable(engrid main.cpp)
@@ -109,6 +96,6 @@ install(
DESTINATION bin
)
-add_dependencies(engrid tetgen libengrid)
+add_dependencies(engrid libengrid)
diff -rupN engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/libengrid/CMakeLists.txt engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/libengrid/CMakeLists.txt
--- engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/libengrid/CMakeLists.txt 2015-03-17 20:09:35.000000000 +0100
+++ engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/libengrid/CMakeLists.txt 2015-03-23 21:20:20.319670294 +0100
@@ -403,7 +403,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
target_link_libraries(libengrid Qt4::QtXml)
endif()
-target_link_libraries(libengrid ${VTK_LIBRARIES})
-INSTALL(TARGETS libengrid LIBRARY DESTINATION lib)
+target_link_libraries(libengrid ${VTK_LIBRARIES} tet Qt4::QtXml)
+INSTALL(TARGETS libengrid LIBRARY DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${libengrid_HEADERS} DESTINATION include/engrid)