fix cmake vars

Author: 7bitcoder

Cmake/Setup.cmake

@@ -15,6 +15,16 @@ endif()
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib)
+
 set(CPACK_PROJECT_NAME ${SEVEN_BIT_DI_PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${SEVEN_BIT_DI_VERSION})
 

Include/SevenBit/DI/LibraryConfig.hpp

@@ -2,17 +2,13 @@
 
 #include "SevenBit/DI/Version.hpp"
 
-#define SEVEN_BIT_DI_HEADER_ONLY
 
-#ifdef SEVEN_BIT_DI_COMPILED_LIB
-#undef SEVEN_BIT_DI_HEADER_ONLY
-
-#ifdef SEVEB_BIT_DI_BUILD_SHARED
+#ifdef SEVEN_BIT_DI_BUILD_SHARED 
 //!!! cmake when compiling shared lib sets <target_name>_EXPORTS
 
 #if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64)
 //  Microsoft
-#ifdef SevenBitDI_EXPORTS
+#ifdef _7BitDI_EXPORTS
 /* We are building this library */
 #define EXPORT __declspec(dllexport)
 #else
@@ -22,7 +18,7 @@
 
 #elif defined(__linux__) || defined(UNIX) || defined(__unix__) || defined(LINUX)
 //  GCC
-#if defined(SevenBitDI_EXPORTS)
+#if defined(_7BitDI_EXPORTS)
 #define EXPORT __attribute__((visibility("default")))
 #else
 #define EXPORT
@@ -35,19 +31,19 @@
 #endif
 
 #else
-// Static lib
+
+// Static lib or header only lib
 #define EXPORT
-#endif
-#endif
 
-#ifdef SEVEN_BIT_DI_HEADER_ONLY
+#ifdef SEVEN_BIT_DI_COMPILED_LIB // Static lib
+#define INLINE 
+
+#else // header only lib
 
 #define SEVEN_BIT_DI_ADD_IMPL
 #define INLINE inline
-#define EXPORT
-
-#else
 
-#define INLINE
+#endif
 
 #endif
+

Source/CMakeLists.txt

@@ -1,12 +1,15 @@
 
-if(SEVEB_BIT_DI_BUILD_SHARED OR BUILD_SHARED_LIBS)
+include(GenerateExportHeader)
+
+if(SEVEN_BIT_DI_BUILD_SHARED OR BUILD_SHARED_LIBS)
   add_library(7BitDI SHARED
-    Source.cpp ${SEVEB_BIT_DI_ALL_HEADERS}
+    Source.cpp ${SEVEN_BIT_DI_ALL_HEADERS}
   )
-  target_compile_definitions(7BitDI PUBLIC SEVEB_BIT_DI_BUILD_SHARED)
+  GENERATE_EXPORT_HEADER(7BitDI)
+  target_compile_definitions(7BitDI PUBLIC SEVEN_BIT_DI_BUILD_SHARED)
 else()
   add_library(7BitDI STATIC
-    Source.cpp ${SEVEB_BIT_DI_ALL_HEADERS}
+    Source.cpp ${SEVEN_BIT_DI_ALL_HEADERS}
   )
 endif()
 

Tests/CMakeLists.txt

@@ -21,6 +21,8 @@ else()
     )
 endif()
 
+install(TARGETS Tests)
+
 gtest_discover_tests(Tests
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
     PROPERTIES TIMEOUT 10)