ZRHC*, added basic data structures (haplotype, genotype, initial pedi…

…gree) and integrated Google test framework.
yp · Oct 5, 2010 · ec2051c · ec2051c
1 parent b4ae1e6
commit ec2051c
Show file tree

Hide file tree

Showing 20 changed files with 857 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,8 @@ set (MAINFOLDER ${PROJECT_SOURCE_DIR})
 set (EXECUTABLE_OUTPUT_PATH "${MAINFOLDER}/bin")
 set (LIBRARY_OUTPUT_PATH "${MAINFOLDER}/lib")
 
+set (project_base_LIB ${PROJECT_NAME}-lib)
+
 #
 # Project Search Paths
 #
@@ -50,9 +52,6 @@ link_directories(${Boost_LIBRARY_DIRS})
 find_package (Log4Cxx REQUIRED)
 include_directories(${Log4Cxx_INCLUDE_DIRS})
 link_directories(${Log4Cxx_LIBRARY_DIRS})
-# find_package (UnitTestPlusPlus REQUIRED)
-# include_directories(${UnitTestPlusPlus_INCLUDE_DIRS})
-# link_directories(${UnitTestPlusPlus_LIBRARY_DIRS})
 
 
 include(ExtractSourceVersionFromGit)
@@ -82,7 +81,7 @@ endforeach (CONFIGINPUT ${CONFIGINPUTS})
 # Add Build Targets
 #
 add_subdirectory(src)
-# add_subdirectory(test)
+add_subdirectory(test)
 
 #
 # Add Install Targets

diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ all: ./build/${STATUS}/Makefile
 
 distclean:
 	@- $(RM) ./bin/*
+	@- $(RM) ./lib/*
 	@- $(RM) ./build/*
 	@- $(RM) ./docs/*.html
 	@- $(RM) ./docs/*.css

diff --git a/src/.gitignore → include/.gitignore b/src/.gitignore → include/.gitignore
diff --git a/src/appinfo.h.in.cmake → include/appinfo.h.in.cmake b/src/appinfo.h.in.cmake → include/appinfo.h.in.cmake
diff --git a/src/application.hpp → include/application.hpp b/src/application.hpp → include/application.hpp
diff --git a/src/assertion.hpp → include/assertion.hpp b/src/assertion.hpp → include/assertion.hpp
@@ -70,13 +70,13 @@ class asserter_t {
 
 #define DESCRIBE __FILE__ ":" BOOST_PP_STRINGIZE(__LINE__)
 
-#define ASSERT( cond ) asserter_t::get_asserter().assert_msg( (cond), "Assertion " BOOST_PP_STRINGIZE( cond ) " failed at file " DESCRIBE)
+#define MY_ASSERT( cond ) asserter_t::get_asserter().assert_msg( (cond), "Assertion " BOOST_PP_STRINGIZE( cond ) " failed at file " DESCRIBE)
 
-#define FAIL asserter_t::get_asserter().assert_msg( (false), "Unexpected control-flow at file " DESCRIBE)
+#define MY_FAIL asserter_t::get_asserter().assert_msg( (false), "Unexpected control-flow at file " DESCRIBE)
 
-#define CHECK( cond ) do {								\
+#define MY_CHECK( cond ) do {								\
   DEBUG("Checking " BOOST_PP_STRINGIZE(cond) "...");	\
-  ASSERT(cond);													\
+  MY_ASSERT(cond);													\
   } while (0)
 
 

diff --git a/src/configuration.h.in.cmake → include/configuration.h.in.cmake b/src/configuration.h.in.cmake → include/configuration.h.in.cmake