Fixes with CMake.

hpfem · Sep 30, 2016 · 6ce20d1 · 6ce20d1
1 parent 78260e2
commit 6ce20d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/2d-advanced/CMakeLists.txt b/2d-advanced/CMakeLists.txt
@@ -25,9 +25,9 @@ ENDIF(WITH_navier-stokes)
 IF(WITH_nernst-planck)
   add_subdirectory(nernst-planck)
 ENDIF(WITH_nernst-planck)
-IF(WITH_neutronics)
-  add_subdirectory(neutronics)
-ENDIF(WITH_neutronics)
+#IF(WITH_neutronics)
+#  add_subdirectory(neutronics)
+#ENDIF(WITH_neutronics)
 IF(WITH_richards)
   add_subdirectory(richards)
 ENDIF(WITH_richards)
@@ -36,4 +36,4 @@ IF(WITH_schroedinger)
 ENDIF(WITH_schroedinger)
 IF(WITH_wave-equation)
   add_subdirectory(wave-equation)
-ENDIF(WITH_wave-equation)
+ENDIF(WITH_wave-equation)
diff --git a/CMake.vars.example.Linux b/CMake.vars.example.Linux
@@ -21,9 +21,8 @@ SET(WITH_2d-advanced YES)
   SET(WITH_maxwell YES)
   SET(WITH_navier-stokes YES)
   SET(WITH_nernst-planck YES)
-  SET(WITH_neutronics YES)
   SET(WITH_richards YES)
   SET(WITH_schroedinger YES)
   SET(WITH_wave-equation YES)
 SET(WITH_2d-benchmarks-general YES)
-SET(WITH_2d-benchmarks-nist YES)
+SET(WITH_2d-benchmarks-nist YES)
diff --git a/CMake.vars.example.Windows b/CMake.vars.example.Windows
@@ -21,9 +21,8 @@ SET(WITH_2d-advanced YES)
   SET(WITH_maxwell YES)
   SET(WITH_navier-stokes YES)
   SET(WITH_nernst-planck YES)
-  SET(WITH_neutronics YES)
   SET(WITH_richards YES)
   SET(WITH_schroedinger YES)
   SET(WITH_wave-equation YES)
 SET(WITH_2d-benchmarks-general YES)
-SET(WITH_2d-benchmarks-nist YES)
+SET(WITH_2d-benchmarks-nist YES)
diff --git a/cmake/CommonTargetProperties.cmake b/cmake/CommonTargetProperties.cmake
@@ -1,10 +1,10 @@
 macro(SET_COMMON_TARGET_PROPERTIES TRGT HERMES_VERSION)
 	set(HERMES_VERSION ${HERMES_VERSION})
-  find_package(HERMES REQUIRED)
+	find_package(HERMES REQUIRED)
 
 	target_link_libraries(${TRGT} ${HERMES_COMMON_LIBRARY})
 	target_link_libraries(${TRGT} ${HERMES_LIBRARY} ${MATIO_LIBRARY} ${BSON_LIBRARY})
-  target_link_libraries(${TRGT} ${TESTING_CORE_LIBRARY})
+	target_link_libraries(${TRGT} ${TESTING_CORE_LIBRARY})
 
 	# Is empty if WITH_TRILINOS = NO
 	target_link_libraries(${TRGT} ${TRILINOS_LIBRARIES})