Skip to content

Commit 3eab0fe

Browse files
GoPlanGoPlan
committed
- Re-organising for iOS compilation
1 parent d444360 commit 3eab0fe

File tree

298 files changed

+505
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+505
-290
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Local folders
2-
Extra
32
Build
43
Testing
54

‎CMakeLists.txt‎

Lines changed: 13 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,24 @@
11
cmake_minimum_required(VERSION 3.2)
2-
project(cldeplus)
2+
project(CldePlus)
33

44
# Build variables
55
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
6-
set(VERSION 0.7.0)
6+
set(VERSION 0.8.0)
77
set(STORAGE "~/Devel")
88
set(EXTRA_DIR ${STORAGE}/Extra)
9-
set(MYSQL_DIR ${EXTRA_DIR}/mysql-connector-c-6.1.6-osx10.8-x86_64)
10-
set(CLDEPARSER_DIR "${EXTRA_DIR}/cldeparser-1.0.0")
11-
set(GTEST_DIR "${EXTRA_DIR}/gtest-1.7.0")
129

13-
# MYSQL
14-
include_directories(${MYSQL_DIR}/include)
15-
link_directories(${MYSQL_DIR}/lib)
16-
17-
# CLDEPARSER
18-
link_directories(${CLDEPARSER_DIR})
19-
include_directories(${CLDEPARSER_DIR}/include)
20-
21-
# GTEST
22-
include_directories(${GTEST_DIR}/include)
23-
link_directories(${GTEST_DIR}/build)
24-
25-
# SOURCE - Core
26-
file(GLOB_RECURSE FOUNDATION_SOURCE Source/Foundation/*.cpp Source/Foundation/*.h Source/Foundation/*.hpp)
27-
file(GLOB_RECURSE RELATION_SOURCE Source/Relation/*.cpp Source/Relation/*.h Source/Relation/*.hpp)
28-
file(GLOB_RECURSE SEGMENTATION_SOURCE Source/Segmentation/*.cpp Source/Segmentation/*.h Source/Segmentation/*.hpp)
29-
30-
# SOURCE - Drivers
31-
file(GLOB_RECURSE DRIVERS_MYSQL Source/Drivers/MySql/*.cpp Source/Drivers/MySql/*.h)
32-
file(GLOB_RECURSE DRIVERS_SQLITE Source/Drivers/SQLite/*.cpp Source/Drivers/SQLite/*.h Source/Drivers/SQLite/Amalgamation/*)
33-
34-
# COMPLETE_SOURCE
35-
set(COMPLETE_SOURCE
36-
Source/cldeplus.h
37-
Source/portable.h
38-
${FOUNDATION_SOURCE}
39-
${RELATION_SOURCE}
40-
${SEGMENTATION_SOURCE}
41-
${DRIVERS_SQLITE}
42-
${DRIVERS_MYSQL})
43-
44-
# MAIN TARGETS
45-
add_library(cldeplus-static STATIC ${COMPLETE_SOURCE})
46-
add_library(cldeplus SHARED ${COMPLETE_SOURCE})
47-
target_link_libraries(cldeplus-static mysqlclient)
48-
target_link_libraries(cldeplus mysqlclient)
49-
50-
set_target_properties(cldeplus cldeplus-static PROPERTIES
51-
VERSION ${VERSION}
52-
SOVERSION ${VERSION}
53-
)
54-
55-
if (APPLE)
56-
set_property(TARGET cldeplus PROPERTY PREFIX "lib")
57-
set_property(TARGET cldeplus PROPERTY SUFFIX ".so")
58-
endif ()
10+
add_subdirectory(CldePlus)
5911

6012
# INSTALLATION
61-
set(INSTALL_DIR "${EXTRA_DIR}")
62-
set(CMAKE_INSTALL_PREFIX ${INSTALL_DIR}/${CMAKE_PROJECT_NAME}-${VERSION})
63-
install(DIRECTORY Source/ DESTINATION include/${CMAKE_PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
64-
install(DIRECTORY Source/ DESTINATION include/${CMAKE_PROJECT_NAME} FILES_MATCHING PATTERN "*.hpp")
65-
install(TARGETS cldeplus cldeplus-static
66-
LIBRARY DESTINATION ./
67-
ARCHIVE DESTINATION ./
68-
)
13+
#set(INSTALL_DIR "${EXTRA_DIR}")
14+
#set(CMAKE_INSTALL_PREFIX ${INSTALL_DIR}/${CMAKE_PROJECT_NAME}-${VERSION})
15+
#install(DIRECTORY CldePlus/ DESTINATION include/${CMAKE_PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
16+
#install(DIRECTORY CldePlus/ DESTINATION include/${CMAKE_PROJECT_NAME} FILES_MATCHING PATTERN "*.hpp")
17+
#install(TARGETS CldePlus cldeplus-static
18+
# LIBRARY DESTINATION ./
19+
# ARCHIVE DESTINATION ./
20+
#)
6921

7022
# TARGET-LIBRARIES (Sub-directories)
71-
add_subdirectory(Examples)
72-
add_subdirectory(Test)
23+
#add_subdirectory(Examples)
24+
#add_subdirectory(Tests)

‎Source/Configuration/JsonConfigurator.cpp‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎Source/Configuration/JsonConfigurator.h‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎Test/Configuration/Configs/CustomerMap.json‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎cldeplus-drivers/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# MYSQL
2+
set(MYSQL_DIR ${EXTRA_DIR}/mysql-connector-c-6.1.6-osx10.8-x86_64)
3+
include_directories(${MYSQL_DIR}/include)
4+
link_directories(${MYSQL_DIR}/lib)
5+
6+
# MYSQL
7+
include_directories(${MYSQL_DIR}/include)
8+
link_directories(${MYSQL_DIR}/lib)

Source/Drivers/MySql/Data/MySqlDate.cpp renamed to cldeplus-drivers/MySql/Data/MySqlDate.cpp

File renamed without changes.

Source/Drivers/MySql/Data/MySqlDate.h renamed to cldeplus-drivers/MySql/Data/MySqlDate.h

File renamed without changes.

Source/Drivers/MySql/Data/MySqlDateTime.cpp renamed to cldeplus-drivers/MySql/Data/MySqlDateTime.cpp

File renamed without changes.

Source/Drivers/MySql/Data/MySqlDateTime.h renamed to cldeplus-drivers/MySql/Data/MySqlDateTime.h

File renamed without changes.

0 commit comments

Comments
 (0)