Blob Blame History Raw
diff -rupN engrid-0563bcc093884687a087b25f2813d420979dc5b7/src/CMakeLists.txt engrid-0563bcc093884687a087b25f2813d420979dc5b7-new/src/CMakeLists.txt
--- engrid-0563bcc093884687a087b25f2813d420979dc5b7/src/CMakeLists.txt	2017-06-15 18:35:46.000000000 +0200
+++ engrid-0563bcc093884687a087b25f2813d420979dc5b7-new/src/CMakeLists.txt	2017-09-07 22:17:13.357202929 +0200
@@ -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" )
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
@@ -83,7 +72,6 @@ include_directories(${QT_QTXML_INCLUDE_D
 include_directories(${QT_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})
@@ -103,7 +91,6 @@ else()
   add_definitions(-DQT_DEBUG)
 endif()
 
-add_subdirectory(tetgen)
 add_subdirectory(libengrid)
 
 add_executable(engrid main.cpp)
@@ -124,6 +111,6 @@ install(
   DESTINATION bin
 )
 
-add_dependencies(engrid tetgen libengrid)
+add_dependencies(engrid libengrid)
 
 
diff -rupN engrid-0563bcc093884687a087b25f2813d420979dc5b7/src/libengrid/CMakeLists.txt engrid-0563bcc093884687a087b25f2813d420979dc5b7-new/src/libengrid/CMakeLists.txt
--- engrid-0563bcc093884687a087b25f2813d420979dc5b7/src/libengrid/CMakeLists.txt	2017-06-15 18:35:46.000000000 +0200
+++ engrid-0563bcc093884687a087b25f2813d420979dc5b7-new/src/libengrid/CMakeLists.txt	2017-09-07 22:17:47.704065857 +0200
@@ -403,7 +403,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
   target_link_libraries(libengrid Qt4::QtXml)
 endif()
 
-target_link_libraries(libengrid ${VTK_LIBRARIES})
+target_link_libraries(libengrid ${VTK_LIBRARIES} tet Qt4::QtXml)
 INSTALL(TARGETS libengrid LIBRARY DESTINATION lib${LIB_SUFFIX})
 INSTALL(FILES ${libengrid_HEADERS} DESTINATION include/engrid)