GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build: Updated common to shared

Browse source
This commit is contained in:
Paul Beckingham 2016-03-15 22:45:24 -04:00
parent 3f9f244f7f
commit 96059d32bd
9 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -42,8 +42,8 @@ configure_file (
${CMAKE_SOURCE_DIR}/cmake.h.in ${CMAKE_SOURCE_DIR}/cmake.h.in
${CMAKE_SOURCE_DIR}/cmake.h) ${CMAKE_SOURCE_DIR}/cmake.h)
ExternalProject_Add (common-1.0 ExternalProject_Add (libshared
GIT_REPOSITORY "ssh://git@git.tasktools.org/tm/common.git" GIT_REPOSITORY "https://git.tasktools.org/scm/tm/libshared.git"
GIT_TAG "master" GIT_TAG "master"
#UPDATE_DISCONNECTED 1 # Needs 3.2 #UPDATE_DISCONNECTED 1 # Needs 3.2
) )

2
ChangeLog
View file

@ -1,7 +1,7 @@
1.0.0 () - 1.0.0 () -
- Introduced the new common library - Introduced the new shared library
Design completed 2015-12-XX Design completed 2015-12-XX

5
src/CMakeLists.txt
View file

@ -9,6 +9,7 @@ set (timew_SRCS Database.cpp Database.h
Grammar.cpp Grammar.h Grammar.cpp Grammar.h
Interval.cpp Interval.h Interval.cpp Interval.h
Lexer.cpp Lexer.h Lexer.cpp Lexer.h
Log.cpp Log.h
LR0.cpp LR0.h LR0.cpp LR0.h
Rules.cpp Rules.h Rules.cpp Rules.h
init.cpp) init.cpp)
@ -19,8 +20,8 @@ link_directories(${CMAKE_INSTALL_PREFIX}/lib)
add_executable (timew_executable timew.cpp) add_executable (timew_executable timew.cpp)
add_executable (gr_executable gr.cpp) add_executable (gr_executable gr.cpp)
target_link_libraries (timew_executable timew commands common ${TIMEW_LIBRARIES}) target_link_libraries (timew_executable timew commands shared ${TIMEW_LIBRARIES})
target_link_libraries (gr_executable timew common ${TIMEW_LIBRARIES}) target_link_libraries (gr_executable timew shared ${TIMEW_LIBRARIES})
set_property (TARGET timew_executable PROPERTY OUTPUT_NAME "timew") set_property (TARGET timew_executable PROPERTY OUTPUT_NAME "timew")
set_property (TARGET gr_executable PROPERTY OUTPUT_NAME "gr") set_property (TARGET gr_executable PROPERTY OUTPUT_NAME "gr")

2
src/Grammar.cpp
View file

@ -27,7 +27,7 @@
#include <cmake.h> #include <cmake.h>
#include <Grammar.h> #include <Grammar.h>
#include <Lexer.h> #include <Lexer.h>
#include <common.h> #include <shared.h>
#include <format.h> #include <format.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

2
src/LR0.cpp
View file

@ -29,7 +29,7 @@
#include <Lexer.h> #include <Lexer.h>
#include <Table.h> #include <Table.h>
#include <Color.h> #include <Color.h>
#include <common.h> #include <shared.h>
#include <format.h> #include <format.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

1
src/commands/CMakeLists.txt
View file

@ -3,6 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/commands
${TIMEW_INCLUDE_DIRS}) ${TIMEW_INCLUDE_DIRS})
include_directories(${CMAKE_INSTALL_PREFIX}/include)
set (commands_SRCS CmdClear.cpp set (commands_SRCS CmdClear.cpp
CmdConfig.cpp CmdConfig.cpp

2
src/init.cpp
View file

@ -31,7 +31,7 @@
#include <Extensions.h> #include <Extensions.h>
//#include <Grammar.h> //#include <Grammar.h>
//#include <LR0.h> //#include <LR0.h>
#include <common.h> #include <shared.h>
#include <format.h> #include <format.h>
#include <FS.h> #include <FS.h>
#include <commands.h> #include <commands.h>

2
src/timew.cpp
View file

@ -30,7 +30,7 @@
#include <Rules.h> #include <Rules.h>
#include <Extensions.h> #include <Extensions.h>
//#include <Grammar.h> //#include <Grammar.h>
#include <common.h> #include <shared.h>
#include <commands.h> #include <commands.h>
#include <timew.h> #include <timew.h>
//#include <LR0.h> //#include <LR0.h>

2
test/CMakeLists.txt
View file

@ -18,7 +18,7 @@ add_custom_target (test ./run_all --verbose
foreach (src_FILE ${test_SRCS}) foreach (src_FILE ${test_SRCS})
add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp) add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
target_link_libraries (${src_FILE} timew common ${TIMEW_LIBRARIES}) target_link_libraries (${src_FILE} timew shared ${TIMEW_LIBRARIES})
endforeach (src_FILE) endforeach (src_FILE)
configure_file(run_all run_all COPYONLY) configure_file(run_all run_all COPYONLY)