Merge pull request #28 from IBM/CppInstall

Cpp install
IBM · Aug 12, 2021 · 41f0aa6 · 41f0aa6
2 parents 2866624 + 878b8fa
commit 41f0aa6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -31,6 +31,11 @@ target_include_directories(${library_name} PUBLIC include)
 target_include_directories(${library_name} PUBLIC ${Boost_INCLUDE_DIRECTORIES})
 target_include_directories(${library_name} PUBLIC ${nlohmann_json_SOURCE_DIR}/single_include)
 target_link_libraries(${library_name} ${Boost_locale_LIBRARIES})
+set_target_properties(alog PROPERTIES PUBLIC_HEADER include/alog/logger.hpp)
+install(
+  TARGETS alog
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alog
+)
 
 # Add the unit tests if enabled
 option(BUILD_UNIT_TESTS "Build the unit tests" ON)

diff --git a/src/cpp/Dockerfile b/src/cpp/Dockerfile
@@ -34,6 +34,10 @@ RUN true && \
     cmake .. && \
     make && \
     ctest && \
+    make install && \
+    test -e /usr/local/include/alog/logger.hpp && \
+    test -e /usr/local/lib/libalog.so && \
+    test -e /usr/local/include/nlohmann/json.hpp && \
     true
 
 ## Release Test ################################################################

diff --git a/src/cpp/include/logger.h → src/cpp/include/alog/logger.hpp b/src/cpp/include/logger.h → src/cpp/include/alog/logger.hpp
diff --git a/src/cpp/src/logger.cpp b/src/cpp/src/logger.cpp
@@ -20,7 +20,7 @@
  */
 
 // Local
-#include "logger.h"
+#include "alog/logger.hpp"
 
 // Standard
 #include <utility>

diff --git a/src/cpp/tests/include/unit_testing.h b/src/cpp/tests/include/unit_testing.h
@@ -21,7 +21,7 @@
 #include <fstream>
 #include <sstream>
 
-#include "logger.h"
+#include "alog/logger.hpp"
 
 namespace test
 {

diff --git a/src/cpp/tools/alog_fib_example/include/fibonacci.h b/src/cpp/tools/alog_fib_example/include/fibonacci.h
@@ -21,7 +21,7 @@
 #include <future>
 
 // First Party
-#include <logger.h>
+#include <alog/logger.hpp>
 
 namespace fib
 {

diff --git a/src/cpp/tools/alog_fib_example/main.cpp b/src/cpp/tools/alog_fib_example/main.cpp
@@ -21,7 +21,7 @@
 #include <sstream>
 
 // First Party
-#include <logger.h>
+#include <alog/logger.hpp>
 
 // Local
 #include "util.h"
@@ -158,4 +158,4 @@ int main(int argc, char *argv[])
       ALOG(MAIN, info, ss.str());
     }
   }
-}
+}