clean files

CMakeLists.txt

@@ -38,28 +38,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake")
 
-# -- GENERAL OPTIONS
-
-# (de)activate modules
-OPTION(WAVES_USE_FLOW        "Compile flow module"             ON)
-OPTION(WAVES_USE_HEAT        "Compile heat module"             ON)
-OPTION(WAVES_USE_MIRRORS     "Compile mirrors module"          ON)
-OPTION(WAVES_USE_KATOPTRON   "Compile katoptron module"        ON)
-OPTION(WAVES_USE_PARAMS      "Compile params module"           ON)
-OPTION(WAVES_USE_TLNOS       "Compile tlnos module"            ON)
-OPTION(WAVES_USE_WAVES       "Compile waves module"            ON)
-
-# --- Disable some Options on Windows
-IF(WIN32)
-    # Trilinos is not available on Windows
-    MESSAGE("Disabling TRILINOS on Windows")
-    SET(WAVES_USE_KATOPTRON OFF CACHE BOOL "" FORCE)
-    SET(WAVES_USE_TLNOS OFF CACHE BOOL "" FORCE)
-ENDIF()
-
-# macros/fcts
-# INCLUDE(fwkMacros)
-
 # -- C++11
 SET(CMAKE_CXX_STANDARD 11) # newer way to set C++11 (requires cmake>=3.1)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -113,9 +91,8 @@ ELSE()
     SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}")
 ENDIF()
 
-# -- Doxygen (https://vicrucann.github.io/tutorials/quick-cmake-doxygen/)
-# check if Doxygen is installed
-FIND_PACKAGE(Doxygen)
+# Doxygen (https://vicrucann.github.io/tutorials/quick-cmake-doxygen/)
+FIND_PACKAGE(Doxygen) # check if Doxygen is installed
 IF(DOXYGEN_FOUND)
     # set input and output files
     SET(DOXYGEN_IN ${PROJECT_SOURCE_DIR}/Doxyfile.in)
@@ -133,7 +110,8 @@ ELSE()
     MESSAGE("Doxygen needs to be installed to generate the doxygen documentation")
 ENDIF()
 
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) # to find "amfe_def.h"
+# -- DEFINE (for SWIG to detect definitions)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # to find "amfe_def.h"
 
 # -- CTest
 ENABLE_TESTING()
@@ -141,8 +119,7 @@ ENABLE_TESTING()
 # -- INSTALL
 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    STRING(REGEX REPLACE "\\\\" "/" PY_SITE ${PY_SITE})
-    SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/waves" CACHE STRING "Install location" FORCE)
+    SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/katoptron" CACHE STRING "Install location" FORCE)
     SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
 ENDIF()
 IF(UNIX AND NOT APPLE)
@@ -150,16 +127,10 @@ IF(UNIX AND NOT APPLE)
 ENDIF()
 
 # -- Sub directories
-
 ADD_SUBDIRECTORY( ext )
+ADD_SUBDIRECTORY( katoptron )
+ADD_SUBDIRECTORY( tlnos )
 
-IF(WAVES_USE_KATOPTRON)
-    ADD_SUBDIRECTORY( katoptron )
-ENDIF()
-
-IF(WAVES_USE_TLNOS)
-    ADD_SUBDIRECTORY( tlnos )
-ENDIF()
 
 # -- FINAL
 MESSAGE(STATUS "PROJECT: ${CMAKE_PROJECT_NAME}")

Doxyfile.in

@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = waves
+PROJECT_NAME           = Katoptron
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -44,7 +44,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Basic FE playground"
+PROJECT_BRIEF          = "Katoptron"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -782,13 +782,10 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @PROJECT_SOURCE_DIR@/README.md \
-                         @PROJECT_SOURCE_DIR@/flow/src \
-                         @PROJECT_SOURCE_DIR@/fwk/src \
-                         @PROJECT_SOURCE_DIR@/heat/src \
-                         @PROJECT_SOURCE_DIR@/mirrors/src \
-                         @PROJECT_SOURCE_DIR@/katoptron/src \
-                         @PROJECT_SOURCE_DIR@/tbox/src \
-                         @PROJECT_SOURCE_DIR@/waves/src 
+                         @PROJECT_SOURCE_DIR@/ext/amfe/fwk/src \
+                         @PROJECT_SOURCE_DIR@/ext/amfe/tbox/src \
+                         @PROJECT_SOURCE_DIR@/ext/amfe/tboxVtk/src \
+                         @PROJECT_SOURCE_DIR@/katoptron/src
 
 
 # This tag can be used to specify the character encoding of the source files