Build: Updated common to shared

CMakeLists.txt

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

ChangeLog

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

src/CMakeLists.txt

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

src/Grammar.cpp

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

src/LR0.cpp

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

src/commands/CMakeLists.txt

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

src/init.cpp

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

src/timew.cpp

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

test/CMakeLists.txt

@@ -18,7 +18,7 @@ add_custom_target (test ./run_all --verbose
 
 foreach (src_FILE ${test_SRCS})
   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)
 
 configure_file(run_all run_all COPYONLY)