[FIX] : fix shared issues

Author: aiekick

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 set(PROJECT ctools)
 enable_language(C CXX)
@@ -11,6 +11,10 @@ option(USE_SDL_CLIPBOARD "Use Clipboard via SDL2 (need SDL2)" OFF)
 option(USE_TESTING_CTOOLS "Enable Ctools Tests" OFF)
 option(USE_SHARED_LIB_CTOOLS  "Enable Ctools Shared Lib" OFF)
 
+if (USE_SHARED_LIB_CTOOLS)
+	set(USE_SHARED_LIBS ON)
+endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -68,7 +72,7 @@ elseif(WIN32)
 endif()
 
 if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /std:c++17")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
 	add_definitions(-D__STDC__)
 	add_definitions(-DMSVC)
 	add_definitions(-DNOMINMAX)
@@ -78,7 +82,9 @@ else ()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++17 -Wunused-parameter -Wno-unknown-pragmas")
 endif ()
 
-if (USE_SHARED_LIB_CTOOLS)
+set(LIBRARIES_TO_LINK_IN_CTOOLS ${LIBRARIES_TO_LINK_IN_CTOOLS})
+
+if (USE_SHARED_LIBS)
 	set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
 	set(LLVM_USE_CRT_DEBUG MDd CACHE STRING "" FORCE)
 	set(LLVM_USE_CRT_MINSIZEREL MD CACHE STRING "" FORCE)
@@ -95,12 +101,6 @@ if (USE_SHARED_LIB_CTOOLS)
 	target_compile_definitions(${PROJECT} INTERFACE BUILD_CTOOLS_SHARED_LIBS)
 	set_target_properties(${PROJECT} PROPERTIES	RUNTIME_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}")
 	set_target_properties(${PROJECT} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-	target_link_libraries(${PROJECT} ${GLAD_LIBRARIES} ${TINYXML2_LIBRARIES})
-	if (USE_GLFW_CLIPBOARD)
-		target_link_libraries(${PROJECT} glfw)
-	elseif(USE_SDL_CLIPBOARD)
-		target_link_libraries(${PROJECT} SDL2)
-	endif()
 else()
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 	set(LLVM_USE_CRT_DEBUG MTd CACHE STRING "" FORCE)
@@ -117,7 +117,7 @@ else()
 		${GLVERSIONCHECKER_INC})
 endif()
 
-include_directories(.)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set_target_properties(${PROJECT} PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -131,13 +131,29 @@ target_include_directories(${PROJECT} PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 	${GLAD_INCLUDE_DIR}
 	${TINYXML2_INCLUDE_DIR}
+	${LIBRARIES_TO_INCLUDE_IN_CTOOLS}
+)
+
+set(CTOOLS_LIBRARIES 
+	${GLAD_LIBRARIES}
+	${TINYXML2_LIBRARIES} 
+	${LIBRARIES_TO_LINK_IN_CTOOLS}
+)
+if (USE_GLFW_CLIPBOARD)
+	set(CTOOLS_LIBRARIES ${CTOOLS_LIBRARIES} glfw)
+elseif(USE_SDL_CLIPBOARD)
+	set(CTOOLS_LIBRARIES ${CTOOLS_LIBRARIES} SDL2)
+endif()
+
+target_link_libraries(${PROJECT} 
+	${CTOOLS_LIBRARIES} 
 )
 
 set(${PROJECT}_Output_Name "${PROJECT}$<$<CONFIG:Debug>:d>")
 set_target_properties(${PROJECT} PROPERTIES	OUTPUT_NAME "${${PROJECT}_Output_Name}")
 
 set(CTOOLS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
-set(CTOOLS_LIBRARIES ${PROJECT} PARENT_SCOPE)
+set(CTOOLS_LIBRARIES ${CTOOLS_LIBRARIES} ${PROJECT} PARENT_SCOPE)
 set(CTOOLS_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 
 #############################################################

include/ctools/FileHelper.h

@@ -29,8 +29,7 @@ SOFTWARE.
 #include <map>
 #include <memory>
 
-#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) || defined(__WIN64__) || defined(WIN64) || \
-    defined(_WIN64) || defined(_MSC_VER)
+#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) || defined(__WIN64__) || defined(WIN64) || defined(_WIN64) || defined(_MSC_VER)
 #if defined(ctools_EXPORTS)
 #define CTOOLS_API __declspec(dllexport)
 #elif defined(BUILD_CTOOLS_SHARED_LIBS)

include/ctools/Logger.h

@@ -25,8 +25,7 @@ SOFTWARE.
 #pragma once
 #pragma warning(disable : 4251)
 
-#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) || defined(__WIN64__) || defined(WIN64) || \
-    defined(_WIN64) || defined(_MSC_VER)
+#if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) || defined(__WIN64__) || defined(WIN64) || defined(_WIN64) || defined(_MSC_VER)
 #if defined(ctools_EXPORTS)
 #define CTOOLS_API __declspec(dllexport)
 #elif defined(BUILD_CTOOLS_SHARED_LIBS)