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

Modernized build paths in CMakeLists.txt

parent 84b7e797

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,10 +318,11 @@ endif() 
#   endif()

#endif()



INCLUDE_DIRECTORIES( src )

INCLUDE_DIRECTORIES( src/3rdparty )

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 )

src/Python/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ find_package( PythonLibs 3 ) 
set( PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages )



if( PYTHONINTERP_FOUND )

   CONFIGURE_FILE( "__init__.py.in" "${PROJECT_BUILD_PATH}/Python/__init__.py" )

   INSTALL( FILES ${PROJECT_BUILD_PATH}/Python/__init__.py

   CONFIGURE_FILE( "__init__.py.in" "__init__.py" )

   INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/__init__.py

                  LogParser.py

            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/TNL )

endif()

src/TNL/Experimental/Arithmetics/UnitTests/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ if( HAVE_GMP ) 
   TARGET_LINK_LIBRARIES( MultiPrecisionTest

                              ${GTEST_BOTH_LIBRARIES}

                              ${GMP_LIBRARIES} )

   ADD_TEST( MultiPrecisionTest ${EXECUTABLE_OUTPUT_PATH}/MultiPrecisionTest${CMAKE_EXECUTABLE_SUFFIX} )

   ADD_TEST( MultiPrecisionTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/MultiPrecisionTest${CMAKE_EXECUTABLE_SUFFIX} )

endif( HAVE_GMP )
@@ -20,5 +20,5 @@ endif( HAVE_GMP ) 
#TARGET_LINK_LIBRARIES( DoubleTest ${GTEST_BOTH_LIBRARIES} )

                           



#ADD_TEST( QuadTest ${EXECUTABLE_OUTPUT_PATH}/QuadTest${CMAKE_EXECUTABLE_SUFFIX} )

#ADD_TEST( DoubleTest ${EXECUTABLE_OUTPUT_PATH}/DoubleTest${CMAKE_EXECUTABLE_SUFFIX} )
 
#ADD_TEST( QuadTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/QuadTest${CMAKE_EXECUTABLE_SUFFIX} )

#ADD_TEST( DoubleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DoubleTest${CMAKE_EXECUTABLE_SUFFIX} )

src/Tools/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line 
add_subdirectory (tnl-quickstart)



CONFIGURE_FILE( "tnl-compile.in" "${PROJECT_TOOLS_PATH}/tnl-compile" @ONLY )

CONFIGURE_FILE( "tnl-bindir.in" "${PROJECT_TOOLS_PATH}/tnl-bindir" @ONLY )

CONFIGURE_FILE( "tnl-compile.in" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-compile" @ONLY )

CONFIGURE_FILE( "tnl-bindir.in" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-bindir" @ONLY )



ADD_EXECUTABLE(tnl-grid-setup tnl-grid-setup.cpp )

ADD_EXECUTABLE(tnl-grid-to-mesh tnl-grid-to-mesh.cpp )
@@ -84,8 +84,8 @@ INSTALL( TARGETS tnl-init 
                 tnl-lattice-init

         DESTINATION bin )



INSTALL( FILES ${PROJECT_TOOLS_PATH}/tnl-bindir

               ${PROJECT_TOOLS_PATH}/tnl-compile

INSTALL( FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-bindir

               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tnl-compile

               tnl-err2eoc

               tnl-log-to-html.py

         DESTINATION bin

src/UnitTests/Algorithms/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ foreach( target IN ITEMS ${CPP_TESTS} ) 
   add_executable( ${target} ${target}.cpp )

   target_compile_options( ${target} PRIVATE ${CXX_TESTS_FLAGS} )

   target_link_libraries( ${target} ${GTEST_BOTH_LIBRARIES} )

   add_test( ${target} ${EXECUTABLE_OUTPUT_PATH}/${target}${CMAKE_EXECUTABLE_SUFFIX} )

   add_test( ${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}${CMAKE_EXECUTABLE_SUFFIX} )

endforeach()



if( BUILD_CUDA )

   foreach( target IN ITEMS ${CUDA_TESTS} )

      cuda_add_executable( ${target} ${target}.cu OPTIONS ${CXX_TESTS_FLAGS} )

      target_link_libraries( ${target} ${GTEST_BOTH_LIBRARIES} )

      add_test( ${target} ${EXECUTABLE_OUTPUT_PATH}/${target}${CMAKE_EXECUTABLE_SUFFIX} )

      add_test( ${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}${CMAKE_EXECUTABLE_SUFFIX} )

   endforeach()

endif()