#1 - Moved files into new structure for more modern CMake usage.

This commit is contained in:
Per Malmberg 2019-03-13 10:20:21 +01:00
parent 4a4cbd47aa
commit c20a146980
17 changed files with 39 additions and 65 deletions

View File

@ -1,29 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>

1
.idea/vcs.xml generated
View File

@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/libcron/externals/date" vcs="Git" />
</component>
</project>

View File

@ -9,22 +9,24 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
endif()
include_directories(${CMAKE_CURRENT_LIST_DIR}/externals/date/include)
add_library(${PROJECT_NAME}
Cron.h
Task.h
CronData.h
TimeTypes.h
CronData.cpp
CronSchedule.cpp
CronSchedule.h
DateTime.h
Task.cpp
CronClock.h
CronClock.cpp)
include/libcron/Cron.h
include/libcron/CronClock.h
include/libcron/CronData.h
include/libcron/CronSchedule.h
include/libcron/DateTime.h
include/libcron/Task.h
include/libcron/TimeTypes.h
src/CronClock.cpp
src/CronData.cpp
src/CronSchedule.cpp
src/Task.cpp)
target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_CURRENT_LIST_DIR}/externals/date/include
PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
set_target_properties(${PROJECT_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}"
LIBRARY_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}"
RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_LOCATION}")
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out")

View File

@ -4,7 +4,7 @@
#include <regex>
#include <string>
#include <vector>
#include "TimeTypes.h"
#include <libcron/TimeTypes.h>
namespace libcron
{

View File

@ -1,6 +1,6 @@
#pragma once
#include "CronData.h"
#include "libcron/CronData.h"
#include <chrono>
#ifdef _WIN32
#pragma warning(push)
@ -11,7 +11,7 @@
#pragma warning(pop)
#endif
#include "DateTime.h"
#include "libcron/DateTime.h"
namespace libcron
{

View File

@ -1,4 +1,4 @@
#include "CronClock.h"
#include "libcron/CronClock.h"
#ifdef WIN32
#ifndef NOMINMAX

View File

@ -1,5 +1,5 @@
#include <date/date.h>
#include "CronData.h"
#include "libcron/CronData.h"
using namespace date;

View File

@ -1,4 +1,4 @@
#include "CronSchedule.h"
#include "libcron/CronSchedule.h"
#include <tuple>
using namespace std::chrono;

View File

@ -1,5 +1,5 @@
#include <iostream>
#include "Task.h"
#include "libcron/Task.h"
using namespace std::chrono;

View File

@ -2,8 +2,8 @@
#include <catch.hpp>
#include <date/date.h>
#include <libcron/Cron.h>
#include <libcron/CronData.h>
#include <libcron/include/libcron/Cron.h>
#include <libcron/include/libcron/CronData.h>
using namespace libcron;
using namespace date;

View File

@ -1,7 +1,7 @@
#include <catch.hpp>
#include <chrono>
#include <date/date.h>
#include <libcron/Cron.h>
#include <libcron/include/libcron/Cron.h>
#include <iostream>
using namespace libcron;

View File

@ -1,5 +1,5 @@
#include <catch.hpp>
#include <libcron/Cron.h>
#include <libcron/include/libcron/Cron.h>
#include <thread>
#include <iostream>