change: minor update

.gitignore

@@ -275,3 +275,6 @@ Doxyfile
 /SequenceComparison/latex
 *.md
 *.bak
+/CMakeFiles
+CMakeCache.txt
+cmake_install.cmake
\ No newline at end of file

SequenceComparison/CMakeLists.txt

@@ -2,28 +2,43 @@ cmake_minimum_required(VERSION 3.2)
 
 #set(CMAKE_VERBOSE_MAKEFILE on)
 
-set (source "${CMAKE_SOURCE_DIR}/../SCwin/main.cpp")
-set (destination "${CMAKE_CURRENT_SOURCE_DIR}/")
-file(COPY ${source} DESTINATION	${destination})
-
-add_custom_target(dumy)
-
-add_custom_command(
- TARGET dumy PRE_BUILD
- #COMMAND ${CMAKE_COMMAND} -E create_symlink ${source} ${destination} 
- COMMAND COPY ${source} DESTINATION ${destination}
- DEPENDS ${destination}
- COMMENT "symbolic link resources folder from ${source} => ${destination}"
+include_directories(
+../unit/
+${CMAKE_CURRENT_SOURCE_DIR}/
 )
 
-#add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
-#				   COMMAND ${CMAKE_COMMAND} COPY 
-#					  ${CMAKE_CURRENT_SOURCE_DIR}/../SCwin/main.cpp $<TARGET_FILE_DIR:antsdll>)
-
-project(ants)
+set (SOURCE_exe 
+	../SCwin/main.cpp
+)
 
+set (SOURCE_unit 
+	../unit/unitmain.cpp
+	../unit/ut_dtw.cpp
+	../unit/ut_op.cpp
+	../unit/ut_help.cpp
+)
 
+#set (destination
+#"${CMAKE_CURRENT_SOURCE_DIR}/"
+#)
+#
+#file(COPY ${source} DESTINATION	${destination})
+#
+#add_custom_target(dumy)
+#
+#add_custom_command(
+# TARGET dumy PRE_BUILD
+# #COMMAND ${CMAKE_COMMAND} -E create_symlink ${source} ${destination} 
+# COMMAND COPY ${source} DESTINATION ${destination}
+# DEPENDS ${destination}
+# COMMENT "symbolic link resources folder from ${source} => ${destination}"
+#)
+#
+##add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+##				   COMMAND ${CMAKE_COMMAND} COPY 
+##					  ${CMAKE_CURRENT_SOURCE_DIR}/../SCwin/main.cpp $<TARGET_FILE_DIR:antsdll>)
 
+project(ants)
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
@@ -92,21 +107,9 @@ endif()
 SET(DEPEND_EXT
 	${LIB_X11}
 	${LIB_FS}
-#	/usr/lib/x86_64-linux-gnu/libX11.so
-#	/usr/lib/gcc/x86_64-linux-gnu/7.2.0/libstdc++fs.a
 )
 
-#add_library(msalongl
-#	calcul.cpp
-#	help.cpp
-#	parser.cpp
-#	print.cpp
-#	preprocess.cpp
-#	#tree.cpp
-#)
-
 add_library(antsl
-	#mains.cpp
 	parameter.cpp
 	calcul.cpp
 	help.cpp
@@ -139,36 +142,19 @@ add_library(antsdll SHARED
 	veSegment.cpp
 )
 set_property(TARGET antsdll PROPERTY POSITION_INDEPENDENT_CODE ON)
-#target_link_libraries(antsdll antsl ${DEPEND_EXT})
+target_link_libraries(antsdll ${DEPEND_EXT})
+
 
 add_executable(ants
-	main.cpp
+	${SOURCE_exe}
 	mains.cpp
-	#mains.cpp
-	#parameter.cpp
-	#help.cpp
-	#parser.cpp
-	#operation.cpp
-	#dtw.cpp
-	#lcss.cpp
-	#calcul.cpp
-	#print.cpp
 )
 target_link_libraries(ants antsl ${DEPEND_EXT})
 
 add_executable(unit	
-	unitmain.cpp
-	ut_dtw.cpp
-	ut_op.cpp
-	ut_help.cpp
+	${SOURCE_unit}
 	mains.cpp
 )
 target_link_libraries(unit antsl ${DEPEND_EXT} )
 
-
-
-#
-#target_link_libraries(msa ${DEPEND_MSA} ${DEPEND_EXT})
-#target_link_libraries(unit ${DEPEND_UNIT} ${DEPEND_EXT})
-
 #set_target_properties(msa PROPERTIES PREFIX "")
\ No newline at end of file

unit/CMakeLists.txt

+cmake_minimum_required(VERSION 3.2)
+
+set(include
+	../SequenceComparison/
+)
+
+include_directories(${include})
+
+set (source 
+	"../SequenceComparison/distancet.h"
+	"../SequenceComparison/external.h"
+	"../SequenceComparison/mains.cpp"
+	"../SequenceComparison/parameter.cpp"
+	"../SequenceComparison/calcul.cpp"
+	"../SequenceComparison/help.cpp"
+	"../SequenceComparison/parser.cpp"
+	"../SequenceComparison/operation.cpp"
+	"../SequenceComparison/dtw.cpp"
+	"../SequenceComparison/lcss.cpp"
+	"../SequenceComparison/pdtw.cpp"
+	"../SequenceComparison/print.cpp"
+	"../SequenceComparison/preprocess.cpp"
+	"../SequenceComparison/draw.cpp"
+	"../SequenceComparison/veTree.cpp"
+	"../SequenceComparison/veSegment.cpp"
+)
+
+set (destination
+"${CMAKE_CURRENT_SOURCE_DIR}/"
+)
+
+#file(COPY ${source} DESTINATION	${destination})
+
+#add_custom_target(dumy)
+
+#add_custom_command(
+# TARGET dumy PRE_BUILD
+# COMMAND ${CMAKE_COMMAND} -E create_symlink ${source} ${destination} 
+## COMMAND COPY ${source} DESTINATION ${destination}
+# DEPENDS ${destination}
+# COMMENT "symbolic link resources folder from ${source} => ${destination}"
+#)
+
+#add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+#				   COMMAND ${CMAKE_COMMAND} COPY 
+#					  ${CMAKE_CURRENT_SOURCE_DIR}/../SCwin/main.cpp $<TARGET_FILE_DIR:antsdll>)
+
+project(unit)
+
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release)
+endif()
+
+#-Wsign-conversion"
+set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -Weffc++ -Wshadow -pedantic -lstdc++fs -lX11 -m64")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+
+find_package(OpenMP)
+if(OPENMP_FOUND)
+	message(STATUS "STATUS: Openmp found")
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
+#if libX11.so lib is in different location on your system -> add path here. 
+find_library(LIB_X11 NAME libX11.so PATHS
+	/usr/lib
+	/usr/lib64
+	/usr/local/lib
+	/usr/local/lib64
+)
+
+#if libstdc++fs.a lib is in different location on your system then add path here. 
+find_library(LIB_FS NAME libstdc++fs.a PATHS
+	/usr/lib/gcc/x86_64-linux-gnu/7.2.0
+	/usr/lib/gcc/x86_64-linux-gnu/7.1.0
+	/usr/lib/gcc/x86_64-linux-gnu/6.4.0
+	/usr/lib/gcc/x86_64-linux-gnu/6.3.0
+	/usr/lib/gcc/x86_64-linux-gnu/5.5.0
+	/usr/lib/gcc/x86_64-linux-gnu/5.4.0
+	/usr/lib
+	/usr/lib64
+	/usr/local/lib
+	/usr/local/lib64
+)
+
+if(NOT LIB_FS)
+	message(STATUS "ERROR: libstdc++fs not found")
+else()
+	message("OK: libstdc++fs found: " ${LIB_FS})
+endif()
+
+SET(DEPEND_EXT
+	${LIB_X11}
+	${LIB_FS}
+)
+
+#add_directory()
+
+add_executable(unit	
+	${source}
+	unitmain.cpp
+	ut_dtw.cpp
+	ut_op.cpp
+	ut_help.cpp
+)
+target_link_libraries(unit ${DEPEND_EXT})
+
+
+
+#
+#target_link_libraries(msa ${DEPEND_MSA} ${DEPEND_EXT})
+#target_link_libraries(unit ${DEPEND_UNIT} ${DEPEND_EXT})
+
+#set_target_properties(msa PROPERTIES PREFIX "")
\ No newline at end of file

unit/unit.vcxproj

@@ -122,6 +122,9 @@
     <ClInclude Include="doctest.h" />
     <ClInclude Include="ut_help.h" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

unit/unit.vcxproj.filters

@@ -36,4 +36,7 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file