Massive re-organization.

This commit is contained in:
Andrew
2013-02-26 16:47:39 -06:00
parent bd64cda672
commit 36396f7c6a
53 changed files with 223 additions and 185 deletions

View File

@@ -1,4 +1,4 @@
project(libmmcsettings)
project(libSettings)
# Find Qt
find_package(Qt5Core REQUIRED)
@@ -7,12 +7,11 @@ find_package(Qt5Core REQUIRED)
include_directories(${Qt5Base_INCLUDE_DIRS})
include_directories(${Qt5Network_INCLUDE_DIRS})
# Include utils library headers.
include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
SET(LIBSETTINGS_HEADERS
include/libsettings_config.h
include/inifile.h
include/settingsobject.h
include/setting.h
include/overridesetting.h
@@ -22,6 +21,8 @@ include/inisettingsobject.h
)
SET(LIBSETTINGS_SOURCES
src/inifile.cpp
src/settingsobject.cpp
src/setting.cpp
src/overridesetting.cpp
@@ -31,10 +32,11 @@ src/inisettingsobject.cpp
)
# Set the include dir path.
SET(LIBMMCSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
include_directories(${LIBSETTINGS_INCLUDE_DIR})
add_definitions(-DLIBMMCSETTINGS_LIBRARY)
add_definitions(-DLIBSETTINGS_LIBRARY)
add_library(libmmcsettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS})
qt5_use_modules(libmmcsettings Core)
target_link_libraries(libmmcsettings libmmcutil)
add_library(libSettings SHARED ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS})
qt5_use_modules(libSettings Core)
target_link_libraries(libSettings)