Commit c386b09e authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'JK/cleanup' into 'develop' 

Advent cleanup

See merge request !75
parents 634962fc 6b7a6a22

.editorconfig

0 → 100644
+19 −0
Original line number Diff line number Diff line 
root = true



[*]

charset = utf-8

end_of_line = lf

insert_final_newline = true

trim_trailing_whitespace = true



[*.{h,hpp,cpp,cu}]

indent_size = 3

indent_style = space



[*.py]

indent_size = 4

indent_style = space



[{CMakeLists.txt,*.cmake}]

indent_size = 3

indent_style = space

CMakeLists.txt

+6 −16
Original line number Diff line number Diff line
@@ -47,21 +47,10 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) 
find_package( OpenMP )

find_package( MPI )



####

# Settings for debug/release version

#

# Settings for debug build

if( CMAKE_BUILD_TYPE STREQUAL "Debug")

    set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Debug/src )

    set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )

    set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/lib )

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )

    set( CMAKE_EXECUTABLE_SUFFIX "-dbg${CMAKE_EXECUTABLE_SUFFIX}" )  # suffix for executables

    set( CMAKE_DEBUG_POSTFIX "-dbg" )  # suffix for libraries

else()

    set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Release/src )

    set( PROJECT_TOOLS_PATH ${PROJECT_SOURCE_DIR}/Release/bin )

    set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/lib )

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Release/bin )

endif()



# check if the compiler is good enough
@@ -329,13 +318,14 @@ endif() 
#   endif()

#endif()



INCLUDE_DIRECTORIES( src )

INCLUDE_DIRECTORIES( ${PROJECT_BUILD_PATH} )

LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} )

# configure build paths

set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin )

set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib )

include_directories( src )

include_directories( src/3rdparty )



# Add all subdirectories

add_subdirectory( src )

add_subdirectory( share )



# Add subdirectories for examples included in the documentation

if( ${WITH_DOC} )

share/CMakeLists.txt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
add_subdirectory (cmake)

add_subdirectory (pkgconfig)

share/cmake/CMakeFindTNL.cmake

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# - Try to find Template Numerical Library TNL

# Once done this will define

#  TNL_FOUND - System has LibXml2

#  TNL_INCLUDE_DIRS - The LibXml2 include directories

#  TNL_LIBRARIES - The libraries needed to use LibXml2

#  TNL_DEFINITIONS - Compiler switches required for using LibXml2



find_package(PkgConfig)

pkg_check_modules(PC_TNL QUIET tnl)

set(TNL_DEFINITIONS ${PC_TNL_CFLAGS_OTHER})



find_path(TNL_INCLUDE_DIR libxml/xpath.h

          HINTS ${PC_LIBXML_INCLUDEDIR} ${PC_LIBXML_INCLUDE_DIRS}

          PATH_SUFFIXES libxml2 )



find_library(TNL_LIBRARY NAMES xml2 libxml2

             HINTS ${PC_LIBXML_LIBDIR} ${PC_LIBXML_LIBRARY_DIRS} )



include(FindPackageHandleStandardArgs)

# handle the QUIETLY and REQUIRED arguments and set TNL_FOUND to TRUE

# if all listed variables are TRUE

find_package_handle_standard_args(LibXml2  DEFAULT_MSG

                                  TNL_LIBRARY TNL_INCLUDE_DIR)



mark_as_advanced(TNL_INCLUDE_DIR TNL_LIBRARY )



set(TNL_LIBRARIES ${TNL_LIBRARY} )

set(TNL_INCLUDE_DIRS ${TNL_INCLUDE_DIR} )

share/cmake/CMakeLists.txt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
#INSTALL( FILES ${PROJECT_TOOLS_PATH}/share/cmake/CMakeFindTNL.cmake

#         DESTINATION share/cmake )
 
 No newline at end of file