From c02c448f47812f581dafd5ed1d1ea950b2939310 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 11 Feb 2017 06:33:08 -0800 Subject: [PATCH] clean up dependencies/msvc inclusion cmake code Move the check for dependencies/msvc into the previous IF(WIN32) block adding an IF(MSVC) level. Remove duplicate call to INCLUDE_DIRECTORIES(dependencies/msvc) from later on in the main CMakeLists.txt. --- CMakeLists.txt | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5bf5f64..bb5b770b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,16 +275,12 @@ IF(WIN32) ENDIF() INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") -ENDIF() -IF(MSVC) - SET(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc") - IF(NOT EXISTS "${DEPS_MSVC}" AND EXISTS "${CMAKE_SOURCE_DIR}/.git") - MESSAGE(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --recursive") + IF(MSVC) + SET(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc") + INCLUDE_DIRECTORIES("${DEPS_MSVC}") # for GL/glext.h and getopt.h ENDIF() - - INCLUDE_DIRECTORIES("${DEPS_MSVC}") # for GL/glext.h -ENDIF(MSVC) +ENDIF() # Compiler flags @@ -635,12 +631,6 @@ IF( ENABLE_FFMPEG ) ) ENDIF( ENABLE_FFMPEG ) -if(MSVC) - INCLUDE_DIRECTORIES( - dependencies/msvc # for getopt.h - ) -endif() - ADD_LIBRARY ( vbamcore STATIC