Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update line endings for all files with CRLF (part 3) #19

Merged
merged 1 commit into from
Sep 2, 2014
Merged

update line endings for all files with CRLF (part 3) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
82 changes: 41 additions & 41 deletions CMake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
#############################################################
# Install useful CMake modules.
# These are necessary to compile the samples from the install
# directory, but can also be used for custom projects.
#############################################################
if(WIN32)
set(MYGUI_CMAKE_DIR "CMake")
else(WIN32)
set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake")
endif(WIN32)
set(INST_FILES
Packages/FindOIS.cmake
Packages/FindOGRE.cmake
Utils/FindPkgMacros.cmake
Utils/PreprocessorUtils.cmake
Utils/MyGUIConfigTargets.cmake
Utils/MyGUIGetVersion.cmake
Utils/MyGUIFindFrameworks.cmake
Templates/VisualStudioUserFile.vcproj.user.in
Templates/VisualStudio2010UserFile.vcxproj.user.in
)
set(STATIC_INST_FILES
Packages/FindDirectX.cmake
Packages/FindDirectX11.cmake
Packages/FindFreetype.cmake
)
if (APPLE)
set(INST_FILES ${INST_FILES}
Packages/FindIOKit.cmake
)
set(STATIC_INST_FILES ${STATIC_INST_FILES}
Packages/FindCarbon.cmake
Packages/FindCocoa.cmake
)
endif ()
#install(FILES ${INST_FILES} DESTINATION ${MYGUI_CMAKE_DIR})
if (MYGUI_STATIC)
install(FILES ${STATIC_INST_FILES} DESTINATION ${MYGUI_CMAKE_DIR})
#############################################################
# Install useful CMake modules.
# These are necessary to compile the samples from the install
# directory, but can also be used for custom projects.
#############################################################

if(WIN32)
set(MYGUI_CMAKE_DIR "CMake")
else(WIN32)
set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake")
endif(WIN32)

set(INST_FILES
Packages/FindOIS.cmake
Packages/FindOGRE.cmake
Utils/FindPkgMacros.cmake
Utils/PreprocessorUtils.cmake
Utils/MyGUIConfigTargets.cmake
Utils/MyGUIGetVersion.cmake
Utils/MyGUIFindFrameworks.cmake
Templates/VisualStudioUserFile.vcproj.user.in
Templates/VisualStudio2010UserFile.vcxproj.user.in
)
set(STATIC_INST_FILES
Packages/FindDirectX.cmake
Packages/FindDirectX11.cmake
Packages/FindFreetype.cmake
)
if (APPLE)
set(INST_FILES ${INST_FILES}
Packages/FindIOKit.cmake
)
set(STATIC_INST_FILES ${STATIC_INST_FILES}
Packages/FindCarbon.cmake
Packages/FindCocoa.cmake
)
endif ()

#install(FILES ${INST_FILES} DESTINATION ${MYGUI_CMAKE_DIR})
if (MYGUI_STATIC)
install(FILES ${STATIC_INST_FILES} DESTINATION ${MYGUI_CMAKE_DIR})
endif ()
216 changes: 108 additions & 108 deletions CMake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
#######################################################################
# Find all necessary and optional MYGUI dependencies
#######################################################################
# MYGUI_DEPENDENCIES_DIR can be used to specify a single base
# folder where the required dependencies may be found.
set(MYGUI_DEPENDENCIES_DIR "Dependencies" CACHE PATH "Path to prebuilt MYGUI dependencies")
include(FindPkgMacros)
getenv_path(MYGUI_DEPENDENCIES_DIR)
set(MYGUI_DEP_SEARCH_PATH
${MYGUI_DEPENDENCIES_DIR}
${ENV_MYGUI_DEPENDENCIES_DIR}
"${MYGUI_BINARY_DIR}/Dependencies"
"${MYGUI_SOURCE_DIR}/Dependencies"
"${MYGUI_BINARY_DIR}/../Dependencies"
"${MYGUI_SOURCE_DIR}/../Dependencies"
)
# Set hardcoded path guesses for various platforms
if (UNIX)
set(MYGUI_DEP_SEARCH_PATH ${MYGUI_DEP_SEARCH_PATH} /usr/local)
endif ()
# give guesses as hints to the find_package calls
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${MYGUI_DEP_SEARCH_PATH})
set(CMAKE_FRAMEWORK_PATH ${CMAKE_FRAMEWORK_PATH} ${MYGUI_DEP_SEARCH_PATH})
if (WIN32)
include(MyGUIInstallDependencies)
endif ()
#######################################################################
# Core dependencies
#######################################################################
if (MYGUI_USE_FREETYPE)
# Find FreeType
find_package(Freetype)
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" TRUE "" "")
endif()
#######################################################################
# RenderSystem dependencies
#######################################################################
if(MYGUI_RENDERSYSTEM EQUAL 5)
# Find DirectX
if(WIN32)
find_package(DirectX)
macro_log_feature(DirectX_FOUND "DirectX" "Support for the DirectX render system" "http://msdn.microsoft.com/en-us/directx/" TRUE "" "")
endif()
elseif(MYGUI_RENDERSYSTEM EQUAL 3)
# Find OGRE
find_package(OGRE_Old)
macro_log_feature(OGRE_FOUND "ogre" "Support for the Ogre render system" "" TRUE "" "")
elseif(MYGUI_RENDERSYSTEM EQUAL 4)
#find_package(ZLIB)
#macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" TRUE "" "")
#find_package(PNG)
#macro_log_feature(PNG_FOUND "PNG" "Png image codec" "http://www.libpng.org/" TRUE "" "")
find_package(OpenGL)
macro_log_feature(OPENGL_FOUND "opengl" "Support for the OpenGL render system" "" TRUE "" "")
elseif(MYGUI_RENDERSYSTEM EQUAL 6)
# Find DirectX11
if(WIN32)
find_package(DirectX11)
macro_log_feature(DirectX_FOUND "DirectX11" "Support for the DirectX11 render system" "http://msdn.microsoft.com/en-us/directx/" TRUE "" "")
endif()
endif()
#######################################################################
# Demos and tools optional dependencies
#######################################################################
# Find OIS
if (MYGUI_SAMPLES_INPUT EQUAL 1)
find_package(OIS)
macro_log_feature(OIS_FOUND "OIS" "Input library needed for the samples" "http://sourceforge.net/projects/wgois" FALSE "" "")
elseif (MYGUI_SAMPLES_INPUT EQUAL 3)
find_package(OIS)
macro_log_feature(OIS_FOUND "OIS" "Input library needed for the samples" "http://sourceforge.net/projects/wgois" FALSE "" "")
endif()
#######################################################################
# Tools
#######################################################################
find_package(Doxygen)
macro_log_feature(DOXYGEN_FOUND "Doxygen" "Tool for building API documentation" "http://doxygen.org" FALSE "" "")
#######################################################################
# Apple-specific
#######################################################################
if (APPLE)
find_package(Carbon)
macro_log_feature(Carbon_FOUND "Carbon" "Carbon" "http://www.apple.com" TRUE "" "")
find_package(Cocoa)
macro_log_feature(Cocoa_FOUND "Cocoa" "Cocoa" "http://www.apple.com" TRUE "" "")
find_package(IOKit)
macro_log_feature(IOKit_FOUND "IOKit" "IOKit HID framework needed by the samples" "http://www.apple.com" FALSE "" "")
endif(APPLE)
# Display results, terminate if anything required is missing
MACRO_DISPLAY_FEATURE_LOG()
#######################################################################
# Find all necessary and optional MYGUI dependencies
#######################################################################

# MYGUI_DEPENDENCIES_DIR can be used to specify a single base
# folder where the required dependencies may be found.
set(MYGUI_DEPENDENCIES_DIR "Dependencies" CACHE PATH "Path to prebuilt MYGUI dependencies")
include(FindPkgMacros)
getenv_path(MYGUI_DEPENDENCIES_DIR)
set(MYGUI_DEP_SEARCH_PATH
${MYGUI_DEPENDENCIES_DIR}
${ENV_MYGUI_DEPENDENCIES_DIR}
"${MYGUI_BINARY_DIR}/Dependencies"
"${MYGUI_SOURCE_DIR}/Dependencies"
"${MYGUI_BINARY_DIR}/../Dependencies"
"${MYGUI_SOURCE_DIR}/../Dependencies"
)

# Set hardcoded path guesses for various platforms
if (UNIX)
set(MYGUI_DEP_SEARCH_PATH ${MYGUI_DEP_SEARCH_PATH} /usr/local)
endif ()

# give guesses as hints to the find_package calls
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${MYGUI_DEP_SEARCH_PATH})
set(CMAKE_FRAMEWORK_PATH ${CMAKE_FRAMEWORK_PATH} ${MYGUI_DEP_SEARCH_PATH})

if (WIN32)
include(MyGUIInstallDependencies)
endif ()


#######################################################################
# Core dependencies
#######################################################################

if (MYGUI_USE_FREETYPE)
# Find FreeType
find_package(Freetype)
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" TRUE "" "")
endif()

#######################################################################
# RenderSystem dependencies
#######################################################################

if(MYGUI_RENDERSYSTEM EQUAL 5)
# Find DirectX
if(WIN32)
find_package(DirectX)
macro_log_feature(DirectX_FOUND "DirectX" "Support for the DirectX render system" "http://msdn.microsoft.com/en-us/directx/" TRUE "" "")
endif()
elseif(MYGUI_RENDERSYSTEM EQUAL 3)
# Find OGRE
find_package(OGRE_Old)
macro_log_feature(OGRE_FOUND "ogre" "Support for the Ogre render system" "" TRUE "" "")
elseif(MYGUI_RENDERSYSTEM EQUAL 4)
#find_package(ZLIB)
#macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" TRUE "" "")
#find_package(PNG)
#macro_log_feature(PNG_FOUND "PNG" "Png image codec" "http://www.libpng.org/" TRUE "" "")
find_package(OpenGL)
macro_log_feature(OPENGL_FOUND "opengl" "Support for the OpenGL render system" "" TRUE "" "")
elseif(MYGUI_RENDERSYSTEM EQUAL 6)
# Find DirectX11
if(WIN32)
find_package(DirectX11)
macro_log_feature(DirectX_FOUND "DirectX11" "Support for the DirectX11 render system" "http://msdn.microsoft.com/en-us/directx/" TRUE "" "")
endif()
endif()

#######################################################################
# Demos and tools optional dependencies
#######################################################################

# Find OIS
if (MYGUI_SAMPLES_INPUT EQUAL 1)
find_package(OIS)
macro_log_feature(OIS_FOUND "OIS" "Input library needed for the samples" "http://sourceforge.net/projects/wgois" FALSE "" "")
elseif (MYGUI_SAMPLES_INPUT EQUAL 3)
find_package(OIS)
macro_log_feature(OIS_FOUND "OIS" "Input library needed for the samples" "http://sourceforge.net/projects/wgois" FALSE "" "")
endif()

#######################################################################
# Tools
#######################################################################

find_package(Doxygen)
macro_log_feature(DOXYGEN_FOUND "Doxygen" "Tool for building API documentation" "http://doxygen.org" FALSE "" "")


#######################################################################
# Apple-specific
#######################################################################
if (APPLE)
find_package(Carbon)
macro_log_feature(Carbon_FOUND "Carbon" "Carbon" "http://www.apple.com" TRUE "" "")

find_package(Cocoa)
macro_log_feature(Cocoa_FOUND "Cocoa" "Cocoa" "http://www.apple.com" TRUE "" "")

find_package(IOKit)
macro_log_feature(IOKit_FOUND "IOKit" "IOKit HID framework needed by the samples" "http://www.apple.com" FALSE "" "")
endif(APPLE)

# Display results, terminate if anything required is missing
MACRO_DISPLAY_FEATURE_LOG()
74 changes: 37 additions & 37 deletions CMake/Packages/FindBerkelium.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
set(BERKELIUM_ROOT "" CACHE PATH "Path to Berklium sources")
SET(BERKELIUM_FOUND FALSE)
IF(EXISTS ${BERKELIUM_ROOT}/include AND EXISTS ${BERKELIUM_ROOT}/lib)
SET(BERKELIUM_INCLUDE_DIRS ${BERKELIUM_ROOT}/include)
SET(BERKELIUM_LIBRARY_DIRS ${BERKELIUM_ROOT}/lib)
ELSE()
IF(WIN32)
IF(EXISTS ${BERKELIUM_ROOT}/win32/berkelium.lib AND EXISTS ${BERKELIUM_ROOT}/win32/berkelium.exe)
SET(BERKELIUM_INCLUDE_DIRS ${BERKELIUM_ROOT}/include)
SET(BERKELIUM_LIBRARY_DIRS ${BERKELIUM_ROOT}/win32)
ENDIF()
ENDIF()
ENDIF()
IF(BERKELIUM_INCLUDE_DIRS AND BERKELIUM_LIBRARY_DIRS)
IF(WIN32) # Windows
FIND_LIBRARY(BERKELIUM_DEBUG_LIBRARY NAMES berkelium_d
PATH_SUFFIXES "" Debug PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
FIND_LIBRARY(BERKELIUM_RELEASE_LIBRARY NAMES berkelium
PATH_SUFFIXES "" Release PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
SET(BERKELIUM_LIBRARIES)
IF(BERKELIUM_DEBUG_LIBRARY AND BERKELIUM_RELEASE_LIBRARY)
SET(BERKELIUM_LIBRARIES debug ${BERKELIUM_DEBUG_LIBRARY} optimized ${BERKELIUM_RELEASE_LIBRARY})
ELSEIF(BERKELIUM_DEBUG_LIBRARY)
SET(BERKELIUM_LIBRARIES ${BERKELIUM_DEBUG_LIBRARY})
ELSEIF(BERKELIUM_RELEASE_LIBRARY)
SET(BERKELIUM_LIBRARIES ${BERKELIUM_RELEASE_LIBRARY})
ENDIF(BERKELIUM_DEBUG_LIBRARY AND BERKELIUM_RELEASE_LIBRARY)
ELSE(WIN32) # Linux etc
FIND_LIBRARY(BERKELIUM_LIBRARIES NAMES berkelium PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
ENDIF(WIN32)
IF(BERKELIUM_LIBRARIES)
SET(BERKELIUM_FOUND TRUE)
ENDIF()
ENDIF()
IF(BERKELIUM_FOUND)
MESSAGE(STATUS "Found Berkelium: headers at ${BERKELIUM_INCLUDE_DIRS}, libraries at ${BERKELIUM_LIBRARIES}")
ENDIF(BERKELIUM_FOUND)
set(BERKELIUM_ROOT "" CACHE PATH "Path to Berklium sources")
SET(BERKELIUM_FOUND FALSE)
IF(EXISTS ${BERKELIUM_ROOT}/include AND EXISTS ${BERKELIUM_ROOT}/lib)
SET(BERKELIUM_INCLUDE_DIRS ${BERKELIUM_ROOT}/include)
SET(BERKELIUM_LIBRARY_DIRS ${BERKELIUM_ROOT}/lib)
ELSE()
IF(WIN32)
IF(EXISTS ${BERKELIUM_ROOT}/win32/berkelium.lib AND EXISTS ${BERKELIUM_ROOT}/win32/berkelium.exe)
SET(BERKELIUM_INCLUDE_DIRS ${BERKELIUM_ROOT}/include)
SET(BERKELIUM_LIBRARY_DIRS ${BERKELIUM_ROOT}/win32)
ENDIF()
ENDIF()
ENDIF()
IF(BERKELIUM_INCLUDE_DIRS AND BERKELIUM_LIBRARY_DIRS)
IF(WIN32) # Windows
FIND_LIBRARY(BERKELIUM_DEBUG_LIBRARY NAMES berkelium_d
PATH_SUFFIXES "" Debug PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
FIND_LIBRARY(BERKELIUM_RELEASE_LIBRARY NAMES berkelium
PATH_SUFFIXES "" Release PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
SET(BERKELIUM_LIBRARIES)
IF(BERKELIUM_DEBUG_LIBRARY AND BERKELIUM_RELEASE_LIBRARY)
SET(BERKELIUM_LIBRARIES debug ${BERKELIUM_DEBUG_LIBRARY} optimized ${BERKELIUM_RELEASE_LIBRARY})
ELSEIF(BERKELIUM_DEBUG_LIBRARY)
SET(BERKELIUM_LIBRARIES ${BERKELIUM_DEBUG_LIBRARY})
ELSEIF(BERKELIUM_RELEASE_LIBRARY)
SET(BERKELIUM_LIBRARIES ${BERKELIUM_RELEASE_LIBRARY})
ENDIF(BERKELIUM_DEBUG_LIBRARY AND BERKELIUM_RELEASE_LIBRARY)
ELSE(WIN32) # Linux etc
FIND_LIBRARY(BERKELIUM_LIBRARIES NAMES berkelium PATHS ${BERKELIUM_LIBRARY_DIRS} NO_DEFAULT_PATH)
ENDIF(WIN32)
IF(BERKELIUM_LIBRARIES)
SET(BERKELIUM_FOUND TRUE)
ENDIF()
ENDIF()
IF(BERKELIUM_FOUND)
MESSAGE(STATUS "Found Berkelium: headers at ${BERKELIUM_INCLUDE_DIRS}, libraries at ${BERKELIUM_LIBRARIES}")
ENDIF(BERKELIUM_FOUND)