Commit dd620011 authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

Merge branch 'FixCmakeConvexParticles' into 'master'

Fixed ordering of cmake commands

See merge request !454
parents fd01f6c9 9e308c43
...@@ -1256,6 +1256,8 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/src ) ...@@ -1256,6 +1256,8 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/src )
# All include paths are specified relative to src/ directory # All include paths are specified relative to src/ directory
include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src ) include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
# sources
add_subdirectory ( src )
# Generate file with compile options, and add install rule for it # Generate file with compile options, and add install rule for it
configure_file ( src/waLBerlaDefinitions.in.h configure_file ( src/waLBerlaDefinitions.in.h
...@@ -1263,8 +1265,6 @@ configure_file ( src/waLBerlaDefinitions.in.h ...@@ -1263,8 +1265,6 @@ configure_file ( src/waLBerlaDefinitions.in.h
install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ ) install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ )
# sources
add_subdirectory ( src )
# test # test
if ( WALBERLA_BUILD_TESTS ) if ( WALBERLA_BUILD_TESTS )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment