Skip to content

Commit

Permalink
Merge branch 'cmake-update'
Browse files Browse the repository at this point in the history
  • Loading branch information
Solokiller committed Jul 14, 2017
2 parents e88fc44 + 840599c commit 749af60
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} SHARED ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${SHARED_INCLUDEPATHS}
)
Expand Down
2 changes: 2 additions & 0 deletions src/cvar/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} SHARED ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${CMAKE_SOURCE_DIR}/external/FMOD/include
${SHARED_INCLUDEPATHS}
Expand Down
2 changes: 2 additions & 0 deletions src/engine/renderer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ endif()

add_library( ${TARGET_NAME} SHARED ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${OPENGL_INCLUDE_DIR}
${SHARED_INCLUDEPATHS}
Expand Down
2 changes: 2 additions & 0 deletions src/filesystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} SHARED ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${SHARED_INCLUDEPATHS}
)
Expand Down
2 changes: 2 additions & 0 deletions src/keyvalues/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} STATIC ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${SHARED_INCLUDEPATHS}
)
Expand Down
2 changes: 2 additions & 0 deletions src/soundsystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} SHARED ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${CMAKE_SOURCE_DIR}/external/FMOD/include
${SHARED_INCLUDEPATHS}
Expand Down
2 changes: 2 additions & 0 deletions src/stdlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ preprocess_sources()

add_library( ${TARGET_NAME} STATIC ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${SHARED_INCLUDEPATHS}
)
Expand Down
4 changes: 3 additions & 1 deletion src/tools/hlmv/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ endif()

add_executable( ${TARGET_NAME} ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${WXWIDGETS_LIB_INCLUDE}
${CMAKE_SOURCE_DIR}/external/wxWidgets/include
Expand Down Expand Up @@ -144,4 +146,4 @@ else()
copy_dependencies( ${TARGET_NAME} external/GLEW/lib libGLEW.so.2.0.0 )
endif()

set_property( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TARGET_NAME} )
set_property( DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TARGET_NAME} )
2 changes: 2 additions & 0 deletions src/tools/spriteviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ endif()

add_executable( ${TARGET_NAME} ${PREP_SRCS} )

check_winxp_support( ${TARGET_NAME} )

target_include_directories( ${TARGET_NAME} PRIVATE
${WXWIDGETS_LIB_INCLUDE}
${CMAKE_SOURCE_DIR}/external/wxWidgets/include
Expand Down

0 comments on commit 749af60

Please sign in to comment.