объединение tool1cd и SystemClasses

soofex · Apr 13, 2018 · e41d248 · e41d248
1 parent d3c1201
commit e41d248
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,6 @@ set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED YES)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-add_subdirectory(${SOURCE_DIR}/SystemClasses)
 add_subdirectory(${SOURCE_DIR}/tool1cd)
 add_subdirectory(${SOURCE_DIR}/ctool1cd)
 add_subdirectory(${SOURCE_DIR}/tests)

diff --git a/src/SystemClasses/CMakeLists.txt b/src/SystemClasses/CMakeLists.txt
diff --git a/src/ctool1cd/CMakeLists.txt b/src/ctool1cd/CMakeLists.txt
@@ -9,10 +9,8 @@ set (CTOOL_HEADERS cTool_1CD_Main.h ParseCommandLine.h ErrorCode.h App.h)
 
 add_executable (ctool1cd ${CTOOL_SOURCES} ${CTOOL_HEADERS})
 
-include_directories (${SOURCE_DIR}/SystemClasses)
-target_link_libraries (ctool1cd SystemClasses)
-
 include_directories (${SOURCE_DIR}/tool1cd)
+include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (ctool1cd tool1cd)
 
 find_package (Boost 1.53 REQUIRED COMPONENTS filesystem regex system)

diff --git a/src/gtool1cd/CMakeLists.txt b/src/gtool1cd/CMakeLists.txt
@@ -61,10 +61,8 @@ set (RESOURCES gtool1cd.rc gtool1cd.qrc)
 
 add_executable(gtool1cd WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${UI_FILES} ${RESOURCES})
 
-include_directories (${SOURCE_DIR}/SystemClasses)
-target_link_libraries (gtool1cd SystemClasses)
-
 include_directories (${SOURCE_DIR}/tool1cd)
+include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (gtool1cd tool1cd)
 
 

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -9,10 +9,8 @@ add_executable(testproject ${TEST_SYSTEM_SOURCES} ${TEST_TOOL1CD_SOURCES} catch_
 
 add_definitions (-DCMAKE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 
-include_directories (${SOURCE_DIR}/SystemClasses)
-target_link_libraries (testproject SystemClasses)
-
 include_directories (${SOURCE_DIR}/tool1cd)
+include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (testproject tool1cd)
 
 find_package (Boost 1.53 REQUIRED COMPONENTS filesystem regex system)

diff --git a/src/tool1cd/CMakeLists.txt b/src/tool1cd/CMakeLists.txt
@@ -1,6 +1,32 @@
 cmake_minimum_required (VERSION 2.8)
 project (tool1cd)
 
+include_directories(../SystemClasses)
+set (SYSTEMCLASSES_SOURCES ../SystemClasses/String.cpp
+		../SystemClasses/System.Classes.cpp
+		../SystemClasses/System.cpp
+		../SystemClasses/System.IOUtils.cpp
+		../SystemClasses/TFileStream.cpp
+		../SystemClasses/TMemoryStream.cpp
+		../SystemClasses/TStream.cpp
+		../SystemClasses/TStreamReader.cpp
+		../SystemClasses/TStreamWriter.cpp
+		../SystemClasses/System.SysUtils.cpp
+		../SystemClasses/GetTickCount.cpp)
+set (SYSTEMCLASSES_HEADERS ../SystemClasses/String.hpp
+		../SystemClasses/System.Classes.hpp
+		../SystemClasses/System.hpp
+		../SystemClasses/System.IOUtils.hpp
+		../SystemClasses/TFileStream.hpp
+		../SystemClasses/TMemoryStream.hpp
+		../SystemClasses/TStream.hpp
+		../SystemClasses/TStreamReader.hpp
+		../SystemClasses/TStreamWriter.hpp
+		../SystemClasses/System.SysUtils.hpp
+		../SystemClasses/GetTickCount.hpp
+		../SystemClasses/Exception.hpp)
+
+
 set (TOOL1CD_SOURCES MessageRegistration.cpp Class_1CD.cpp
 	Common.cpp ConfigStorage.cpp Parse_tree.cpp TempStream.cpp Base64.cpp UZLib.cpp Messenger.cpp
 	V8Object.cpp Field.cpp Index.cpp Table.cpp TableFiles.cpp TableFileStream.cpp
@@ -20,10 +46,12 @@ set (TOOL1CD_SOURCES ${TOOL1CD_SOURCES} cfapi/V8File.cpp cfapi/V8Catalog.cpp cfa
 set (TOOL1CD_HEADERS ${TOOL1CD_HEADERS} cfapi/V8File.h cfapi/V8Catalog.h cfapi/TV8FileStream.h
 	cfapi/APIcfBase.h cfapi/V8Time.h)
 
+set (TOOL1CD_SOURCES ${TOOL1CD_SOURCES} ${SYSTEMCLASSES_SOURCES})
+set (TOOL1CD_HEADERS ${TOOL1CD_HEADERS} ${SYSTEMCLASSES_HEADERS})
+
 add_library (tool1cd STATIC ${TOOL1CD_SOURCES} ${TOOL1CD_HEADERS})
 
-include_directories (${SOURCE_DIR}/SystemClasses)
-target_link_libraries (tool1cd SystemClasses)
+set_target_properties(tool1cd PROPERTIES LINKER_LANGUAGE CXX)
 
 find_package (Boost 1.53 REQUIRED COMPONENTS filesystem regex system)
 include_directories (${Boost_INCLUDE_DIRS})