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.
This commit is contained in:
parent
d6c1b53653
commit
c02c448f47
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue