Cleanup up on CMakeLists.txt (#1564)
This commit is contained in:
committed by
GitHub
parent
20cb37e39f
commit
e1d6ec8abf
@@ -12,52 +12,44 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
cmake_minimum_required( VERSION 3.2 )
|
||||
|
||||
option (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON)
|
||||
option (TESTS_BUILD_ONLY_DYNAMIC "Build only dynamic" OFF)
|
||||
option( TESTS_BUILD_WITH_LOCAL_VULKAN_HPP "Build with local Vulkan headers" ON )
|
||||
option( TESTS_BUILD_ONLY_DYNAMIC "Build only dynamic" OFF )
|
||||
|
||||
if (NOT (TESTS_BUILD_ONLY_DYNAMIC AND TESTS_BUILD_WITH_LOCAL_VULKAN_HPP))
|
||||
find_package(Vulkan REQUIRED)
|
||||
if( NOT (TESTS_BUILD_ONLY_DYNAMIC AND TESTS_BUILD_WITH_LOCAL_VULKAN_HPP) )
|
||||
find_package( Vulkan REQUIRED )
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
add_compile_options(/W4 /WX /permissive-)
|
||||
else(MSVC)
|
||||
add_compile_options(-Wall -Wextra -pedantic -Werror)
|
||||
endif(MSVC)
|
||||
|
||||
if (WIN32)
|
||||
add_definitions(-DNOMINMAX -DVK_USE_PLATFORM_WIN32_KHR)
|
||||
elseif(APPLE)
|
||||
add_definitions(-DVK_USE_PLATFORM_MACOS_MVK)
|
||||
elseif(UNIX)
|
||||
add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
|
||||
endif()
|
||||
|
||||
if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP)
|
||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
|
||||
if( MSVC )
|
||||
add_compile_options( /W4 /WX /permissive- )
|
||||
else()
|
||||
include_directories("${Vulkan_INCLUDE_DIRS}")
|
||||
add_compile_options( -Wall -Wextra -pedantic -Werror )
|
||||
endif()
|
||||
|
||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm")
|
||||
if( TESTS_BUILD_WITH_LOCAL_VULKAN_HPP )
|
||||
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/.." )
|
||||
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include" )
|
||||
else()
|
||||
include_directories( "${Vulkan_INCLUDE_DIRS}" )
|
||||
endif()
|
||||
|
||||
add_subdirectory(ArrayProxy)
|
||||
add_subdirectory(ArrayProxyNoTemporaries)
|
||||
add_subdirectory(DesignatedInitializers)
|
||||
add_subdirectory(DeviceFunctions)
|
||||
add_subdirectory(DispatchLoaderDynamic)
|
||||
add_subdirectory(DispatchLoaderDynamicSharedLibrary)
|
||||
add_subdirectory(DispatchLoaderDynamicSharedLibraryClient)
|
||||
add_subdirectory(DispatchLoaderStatic)
|
||||
add_subdirectory(ExtensionInspection)
|
||||
add_subdirectory(Flags)
|
||||
add_subdirectory(FormatTraits)
|
||||
add_subdirectory(Hash)
|
||||
add_subdirectory(NoExceptions)
|
||||
add_subdirectory(StridedArrayProxy)
|
||||
add_subdirectory(StructureChain)
|
||||
add_subdirectory(UniqueHandle)
|
||||
add_subdirectory(UniqueHandleDefaultArguments)
|
||||
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../glm" )
|
||||
|
||||
add_subdirectory( ArrayProxy )
|
||||
add_subdirectory( ArrayProxyNoTemporaries )
|
||||
add_subdirectory( DesignatedInitializers )
|
||||
add_subdirectory( DeviceFunctions )
|
||||
add_subdirectory( DispatchLoaderDynamic )
|
||||
add_subdirectory( DispatchLoaderDynamicSharedLibrary )
|
||||
add_subdirectory( DispatchLoaderDynamicSharedLibraryClient )
|
||||
add_subdirectory( DispatchLoaderStatic )
|
||||
add_subdirectory( ExtensionInspection )
|
||||
add_subdirectory( Flags )
|
||||
add_subdirectory( FormatTraits )
|
||||
add_subdirectory( Hash )
|
||||
add_subdirectory( NoExceptions )
|
||||
add_subdirectory( StridedArrayProxy )
|
||||
add_subdirectory( StructureChain )
|
||||
add_subdirectory( UniqueHandle )
|
||||
add_subdirectory( UniqueHandleDefaultArguments )
|
||||
|
||||
Reference in New Issue
Block a user