Skip to content

Commit

Permalink
Substantially reorganise sources to insulate
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyelewis committed Nov 3, 2017
1 parent 8f090d7 commit c51ce31
Show file tree
Hide file tree
Showing 1,166 changed files with 1,745 additions and 1,800 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ execute_process(
)

configure_file( "source/cath_tools_git_version.hpp.in"
"source/cath_tools_git_version.hpp"
"source/cath_tools_git_version/cath_tools_git_version.hpp"
)

include_directories( $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/source/cath_tools_git_version> )


SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/" )
IF ( ${CMAKE_VERSION} VERSION_GREATER "3.5.0" )
SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/FindBoostModules_gt_3.5.0/" )
Expand Down Expand Up @@ -116,14 +119,12 @@ endif()
include_directories( SYSTEM ${Boost_INCLUDE_DIR} )
include_directories( SYSTEM ${GSL_INCLUDE_DIR} )
include_directories( SYSTEM rapidjson/include )
include_directories( source )

# Define GSL_RANGE_CHECK_OFF in non-debug builds
add_compile_options( $<$<NOT:$<CONFIG:DEBUG>>:-DGSL_RANGE_CHECK_OFF> )

add_definitions( -DRAPIDJSON_HAS_STDSTRING=1 )

SET( CMAKE_INCLUDE_CURRENT_DIR ON )
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY .. )

if ( DEFINED ENV{BUILD_REVISION_NUMBER} )
Expand All @@ -133,4 +134,4 @@ if ( DEFINED ENV{BUILD_BRANCH_NAME} )
add_definitions( -DBUILD_BRANCH_NAME=$ENV{BUILD_BRANCH_NAME} )
endif ( DEFINED ENV{BUILD_BRANCH_NAME} )

add_subdirectory ( source )
add_subdirectory( source )
402 changes: 144 additions & 258 deletions source/CMakeLists.txt

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions source/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Layout:

* cath-superpose-multi-temp-script - Script to make it a bit easier to do multiple superpositions with cath-superpose
* cath_tools_git_version.hpp.in - Template from which CMake can make a header in the build directory with the Git version details
* CMakeLists.txt - CMake configuration file for these sources
* src_* - Individual libraries in separate directories to prevent inappropriate #include-ing
* uni - A big mess of interdependent source code that should be separated out into libraries
* [anything else] - Library that isn't quite separated enough as yet to go into its own separate src_* directory

Ideally, code should migrate from uni / [anything else] into src_*.

0 comments on commit c51ce31

Please sign in to comment.