Removed STORMBYTE_AS_DEPENDENCY

Author: StormBytePP

cmake/asan.cmake

@@ -1,6 +1,6 @@
 option(ENABLE_ASAN "Enable AddressSanitizer (and UBSan) for debug builds" OFF)
 
-if(ENABLE_ASAN AND NOT STORMBYTE_AS_DEPENDENCY AND NOT WIN32)
+if(ENABLE_ASAN AND NOT WIN32)
 	# Recommend Debug builds for ASan
 	set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE)
 

cmake/install.cmake

@@ -1,19 +1,12 @@
-# Install (on Windows only install DLLs)
-if (WIN32)
-	install(TARGETS StormByte
-		RUNTIME 		DESTINATION ${CMAKE_INSTALL_BINDIR}
-	)
-elseif (NOT STORMBYTE_AS_DEPENDENCY)
-	install(TARGETS StormByte
-		ARCHIVE 		DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-		LIBRARY 		DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-		RUNTIME 		DESTINATION ${CMAKE_INSTALL_BINDIR}
-	)
-	install(DIRECTORY "${CMAKE_SOURCE_DIR}/lib/public/StormByte/"
-		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StormByte"
-		FILES_MATCHING
-		PATTERN "*.h"
-		PATTERN "*.hxx"
-	)
-	install(FILES "${CMAKE_SOURCE_DIR}/cmake/FindStormByte.cmake" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-endif()
+install(TARGETS StormByte
+	ARCHIVE 		DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	LIBRARY 		DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	RUNTIME 		DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/lib/public/StormByte/"
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/StormByte"
+	FILES_MATCHING
+	PATTERN "*.h"
+	PATTERN "*.hxx"
+)
+install(FILES "${CMAKE_SOURCE_DIR}/cmake/FindStormByte.cmake" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")

cmake/optimizations.cmake

@@ -1,7 +1,6 @@
 # Optimizations
 if (CMAKE_BUILD_TYPE STREQUAL "Release" AND MSVC)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2 /GL /Gy /arch:AVX2 /fp:fast /DNDEBUG")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /GL /Gy /arch:AVX2 /fp:fast /DNDEBUG")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
-endif()
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2 /fp:fast /DNDEBUG")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2 /fp:fast /DNDEBUG")
+endif()
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE)

cmake/outputflags.cmake

@@ -1,6 +1,4 @@
-if (NOT STORMBYTE_AS_DEPENDENCY)
-	message(STATUS "C Flags:         ${CMAKE_C_FLAGS}")
-	message(STATUS "CXX Flags:       ${CMAKE_CXX_FLAGS}")
-	message(STATUS "Exe Linker:      ${CMAKE_EXE_LINKER_FLAGS}")
-	message(STATUS "Shared Linker:   ${CMAKE_SHARED_LINKER_FLAGS}")
-endif()
+message(STATUS "C Flags:         ${CMAKE_C_FLAGS}")
+message(STATUS "CXX Flags:       ${CMAKE_CXX_FLAGS}")
+message(STATUS "Exe Linker:      ${CMAKE_EXE_LINKER_FLAGS}")
+message(STATUS "Shared Linker:   ${CMAKE_SHARED_LINKER_FLAGS}")

test/CMakeLists.txt

@@ -1,5 +1,5 @@
 option(ENABLE_TEST "Enable Unit Tests" OFF)
-if(ENABLE_TEST AND NOT STORMBYTE_AS_DEPENDENCY)
+if(ENABLE_TEST)
 	enable_testing()
 
 	add_executable(BitmaskTests bitmask_test.cxx)