Revision: 1567
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1567&view=rev
Author: rorthomas
Date: 2011-01-15 22:45:25 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
new dependency folder structure for windows
fixed some VS2010 warnings
fixed runtime output path
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/CMakeLists.txt
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2011-01-15 22:29:34 UTC (rev 1566)
+++ trunk/CMakeDependenciesConfig.txt 2011-01-15 22:45:25 UTC (rev 1567)
@@ -32,135 +32,131 @@
message(FATAL_ERROR "Rigs of Rods dependency dir not set
properly!")
endif(NOT ROR_DEPENDENCIES_DIR)
- #### REQUIRED COMPONENTS
- set(Ogre_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/Ogre"
CACHE PATH "The ogre include path to use")
- set(Ogre_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH
"The ogre lib path to use")
- set(Ogre_LIBRARIES "OgreMain" CACHE STRING "The ogre lib to
link against")
+ #### REQUIRED COMPONENTS
+ set(Ogre_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/Ogre" CACHE PATH
"The ogre include path to use")
+ set(Ogre_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Ogre" CACHE PATH
"The ogre lib path to use")
+ set(Ogre_LIBRARIES "OgreMain" CACHE STRING "The ogre lib to link
against")
- set(Ogre_Terrain_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Paging" CACHE PATH "The ogre terrain
include path to use")
- set(Ogre_Terrain_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The ogre terrain lib path to use")
- set(Ogre_Terrain_LIBRARIES "OgreTerrain" CACHE STRING "The ogre
terrain lib to link against")
+ set(Ogre_Terrain_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Paging" CACHE PATH "The ogre terrain
include path to use")
+ set(Ogre_Terrain_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Ogre" CACHE
PATH "The ogre terrain lib path to use")
+ set(Ogre_Terrain_LIBRARIES "OgreTerrain" CACHE STRING "The ogre terrain
lib to link against")
- set(Ogre_Paging_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Terrain" CACHE PATH "The ogre Paging
include path to use")
- set(Ogre_Paging_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The ogre Paging lib path to use")
- set(Ogre_Paging_LIBRARIES "OgrePaging" CACHE STRING "The ogre
Paging lib to link against")
+ set(Ogre_Paging_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/Terrain" CACHE PATH "The ogre Paging
include path to use")
+ set(Ogre_Paging_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Ogre" CACHE
PATH "The ogre Paging lib path to use")
+ set(Ogre_Paging_LIBRARIES "OgrePaging" CACHE STRING "The ogre Paging
lib to link against")
- set(Ogre_RTShader_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/RTShaderSystem" CACHE PATH "The ogre
RTShaderSystem include path to use")
- set(Ogre_RTShader_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The ogre RTShaderSystem lib path to use")
- set(Ogre_RTShader_LIBRARIES "OgreRTShaderSystem" CACHE STRING
"The ogre RTShaderSystem lib to link against")
-
- set(Ois_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/ois"
CACHE PATH "The OIS include path to use")
- set(Ois_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH
"The OIS lib path to use")
- set(Ois_LIBRARIES "ois" CACHE STRING "The ogre lib to link
against")
+ set(Ogre_RTShader_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Ogre/RTShaderSystem" CACHE PATH "The ogre
RTShaderSystem include path to use")
+ set(Ogre_RTShader_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Ogre" CACHE
PATH "The ogre RTShaderSystem lib path to use")
+ set(Ogre_RTShader_LIBRARIES "OgreRTShaderSystem" CACHE STRING "The ogre
RTShaderSystem lib to link against")
- set(BOOST_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/boost"
CACHE PATH "The BOOST include path to use")
- set(BOOST_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/boost"
CACHE PATH "The BOOST lib path to use")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/Ogre ${EXECUTABLE_OUTPUT_PATH})
- set(CURL_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/" CACHE
PATH "The curl include path to use")
- set(CURL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH
"The curl lib path to use")
- set(CURL_LIBRARIES "libcurl.lib" CACHE STRING "The curl lib to
link against")
-
- set(PThread_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/pthread" CACHE PATH "The pthread include path
to use")
- set(PThread_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib" CACHE
PATH "The pthread lib path to use")
- set(PThread_LIBRARIES "pthreadVC2.lib" CACHE STRING "The
pthread lib to link against")
- include_directories(${PThread_INCLUDE_DIRS})
- link_directories (${PThread_LIBRARY_DIRS})
+ set(Ois_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/ois" CACHE PATH
"The OIS include path to use")
+ set(Ois_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/ois" CACHE PATH "The
OIS lib path to use")
+ set(Ois_LIBRARIES "ois" CACHE STRING "The ogre lib to link against")
- # directX
- set(DirectX_INCLUDE_DIRS "$ENV{DXSDK_DIR}/Include" CACHE PATH
"The DirectX include path to use")
- set(DirectX_LIBRARY_DIRS "$ENV{DXSDK_DIR}/Lib/x86" CACHE PATH
"The DirectX lib path to use")
- include_directories(${DirectX_INCLUDE_DIRS})
- link_directories (${DirectX_LIBRARY_DIRS})
+ set(BOOST_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/boost" CACHE
PATH "The BOOST include path to use")
+ set(BOOST_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/boost" CACHE PATH
"The BOOST lib path to use")
+ # special include path for curl ...
+ set(CURL_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/" CACHE PATH
"The curl include path to use")
+ set(CURL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/curl" CACHE PATH
"The curl lib path to use")
+ set(CURL_LIBRARIES "libcurl.lib" CACHE STRING "The curl lib to link
against")
+
+ set(PThread_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/pthread"
CACHE PATH "The pthread include path to use")
+ set(PThread_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/pthread" CACHE
PATH "The pthread lib path to use")
+ set(PThread_LIBRARIES "pthreadVC2.lib" CACHE STRING "The pthread lib to
link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/pthread
${EXECUTABLE_OUTPUT_PATH})
+ include_directories(${PThread_INCLUDE_DIRS})
+ link_directories (${PThread_LIBRARY_DIRS})
- #### OPTIONAL COMPONENTS
- if(ROR_USE_MYGUI)
- set(MYGUI_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/MyGUI" CACHE PATH "The mygui include path to
use")
- set(MYGUI_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The mygui lib path to use")
- set(MYGUI_LIBRARIES
"MyGUI.OgrePlatform.lib;MyGUIEngine.lib" CACHE STRING "The mygui libs to link
against")
- endif(ROR_USE_MYGUI)
+ # directX
+ set(DirectX_INCLUDE_DIRS "$ENV{DXSDK_DIR}/Include" CACHE PATH "The
DirectX include path to use")
+ set(DirectX_LIBRARY_DIRS "$ENV{DXSDK_DIR}/Lib/x86" CACHE PATH "The
DirectX lib path to use")
+ include_directories(${DirectX_INCLUDE_DIRS})
+ link_directories (${DirectX_LIBRARY_DIRS})
- if(ROR_USE_OPENAL)
- set(OPENAL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/openal-soft" CACHE PATH "The openal include
path to use")
- set(OPENAL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The openal lib path to use")
- set(OPENAL_LIBRARIES "OpenAL32.lib" CACHE STRING
"The openal libs to link against")
- endif(ROR_USE_OPENAL)
- if(ROR_USE_LUA)
- set(LUA_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/lua" CACHE PATH "The lua include path to use")
- set(LUA_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The lua lib path to use")
- set(LUA_LIBRARIES "lua.lib" CACHE STRING "The lua
lib to link against")
- endif(ROR_USE_LUA)
+ #### OPTIONAL COMPONENTS
+ if(ROR_USE_MYGUI)
+ set(MYGUI_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/MyGUI"
CACHE PATH "The mygui include path to use")
+ set(MYGUI_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/MyGUI"
CACHE PATH "The mygui lib path to use")
+ set(MYGUI_LIBRARIES "MyGUI.OgrePlatform.lib;MyGUIEngine.lib"
CACHE STRING "The mygui libs to link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/MyGUI
${EXECUTABLE_OUTPUT_PATH})
+ endif(ROR_USE_MYGUI)
- if(ROR_USE_SOCKETW)
- set(SOCKETW_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/SocketW" CACHE PATH "The socketw include path
to use")
- set(SOCKETW_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The socketw lib path to use")
- set(SOCKETW_LIBRARIES "mysocketw.lib;Ws2_32.lib"
CACHE STRING "The socketw lib to link against")
- endif(ROR_USE_SOCKETW)
+ if(ROR_USE_OPENAL)
+ set(OPENAL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/openal-soft" CACHE PATH "The openal include
path to use")
+ set(OPENAL_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/openal-soft" CACHE PATH "The openal lib path to
use")
+ set(OPENAL_LIBRARIES "OpenAL32.lib" CACHE STRING "The openal
libs to link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/openal-soft
${EXECUTABLE_OUTPUT_PATH})
+ endif(ROR_USE_OPENAL)
- if(ROR_USE_MOFILEREADER)
- set(MOFILEREADER_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/mofilereader" CACHE PATH "The mofilereader
include path to use")
- set(MOFILEREADER_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH "The mofilereader lib path to use")
- set(MOFILEREADER_LIBRARIES "moFileReader.static.lib"
CACHE STRING "The mofilereader lib to link against")
- endif(ROR_USE_MOFILEREADER)
+ if(ROR_USE_LUA)
+ set(LUA_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/lua"
CACHE PATH "The lua include path to use")
+ set(LUA_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/lua" CACHE
PATH "The lua lib path to use")
+ set(LUA_LIBRARIES "lua.lib" CACHE STRING "The lua lib to
link against")
+ endif(ROR_USE_LUA)
- if(ROR_USE_PAGED)
- set(PAGED_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/PagedGeometry" CACHE PATH "The paged include
path to use")
- set(PAGED_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The paged lib path to use")
- set(PAGED_LIBRARIES "PagedGeometry.lib" CACHE STRING
"The paged lib to link against")
- endif(ROR_USE_PAGED)
+ if(ROR_USE_SOCKETW)
+ set(SOCKETW_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/SocketW" CACHE PATH "The socketw include path
to use")
+ set(SOCKETW_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/SocketW"
CACHE PATH "The socketw lib path to use")
+ set(SOCKETW_LIBRARIES "mysocketw.lib;Ws2_32.lib" CACHE
STRING "The socketw lib to link against")
+ endif(ROR_USE_SOCKETW)
- if(ROR_USE_CAELUM)
- set(CAELUM_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Caelum" CACHE PATH "The caelum include path to
use")
- set(CAELUM_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The caelum lib path to use")
- set(CAELUM_LIBRARIES "caelum.lib" CACHE STRING "The
caelum lib to link against")
- endif(ROR_USE_CAELUM)
+ if(ROR_USE_MOFILEREADER)
+ set(MOFILEREADER_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/mofilereader" CACHE PATH "The mofilereader
include path to use")
+ set(MOFILEREADER_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/mofilereader" CACHE PATH "The mofilereader lib
path to use")
+ set(MOFILEREADER_LIBRARIES "moFileReader.static.lib" CACHE
STRING "The mofilereader lib to link against")
+ endif(ROR_USE_MOFILEREADER)
- if(ROR_USE_CRASHRPT)
- set(CRASHRPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/CrashRpt" CACHE PATH "The CrashRpt include
path to use")
- set(CRASHRPT_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The CrashRpt lib path to use")
- set(CRASHRPT_LIBRARIES "CrashRpt.lib" CACHE STRING
"The CrashRpt lib to link against")
- endif(ROR_USE_CRASHRPT)
+ if(ROR_USE_PAGED)
+ set(PAGED_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/PagedGeometry" CACHE PATH "The paged include
path to use")
+ set(PAGED_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/PagedGeometry" CACHE PATH "The paged lib path to
use")
+ set(PAGED_LIBRARIES "PagedGeometry.lib" CACHE STRING "The
paged lib to link against")
+ endif(ROR_USE_PAGED)
- if(ROR_USE_ANGELSCRIPT)
- set(ANGELSCRIPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/AngelScript" CACHE PATH "The AngelScript
include path to use")
- set(ANGELSCRIPT_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH "The AngelScript lib path to use")
- set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE
STRING "The AngelScript lib to link against")
- endif(ROR_USE_ANGELSCRIPT)
+ if(ROR_USE_CAELUM)
+ set(CAELUM_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Caelum" CACHE PATH "The caelum include path to
use")
+ set(CAELUM_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Caelum"
CACHE PATH "The caelum lib path to use")
+ set(CAELUM_LIBRARIES "caelum.lib" CACHE STRING "The caelum
lib to link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/Caelum
${EXECUTABLE_OUTPUT_PATH})
+ endif(ROR_USE_CAELUM)
- if(ROR_USE_HYDRAX)
- set(HYDRAX_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Hydrax;${ROR_DEPENDENCIES_DIR}/include/" CACHE
PATH "The Hydrax include paths to use")
- set(HYDRAX_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The Hydrax lib path to use")
- set(HYDRAX_LIBRARIES "Hydrax.lib" CACHE STRING "The
Hydrax lib to link against")
- endif(ROR_USE_HYDRAX)
+ if(ROR_USE_CRASHRPT)
+ set(CRASHRPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/CrashRpt" CACHE PATH "The CrashRpt include
path to use")
+ set(CRASHRPT_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/CrashRpt" CACHE PATH "The CrashRpt lib path to
use")
+ set(CRASHRPT_LIBRARIES "CrashRpt.lib" CACHE STRING "The
CrashRpt lib to link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/CrashRpt
${EXECUTABLE_OUTPUT_PATH})
+ endif(ROR_USE_CRASHRPT)
- if(ROR_BUILD_CONFIGURATOR)
- set(WXWIDGETS_SHARED_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/wxWidgets" CACHE PATH "The wxWidgets (shared)
include paths to use")
- set(WXWIDGETS_SHARED_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/wx/shared" CACHE PATH "The wxWidgets (shared) lib
path to use")
- set(WXWIDGETS_SHARED_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxbase29u_net.lib;wxmsw29u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32;wxmsw29u_propgrid.lib;wxmsw29u_aui.lib"
CACHE STRING "The wxWidgets(shared) libs to link against")
- endif(ROR_BUILD_CONFIGURATOR)
+ if(ROR_USE_ANGELSCRIPT)
+ set(ANGELSCRIPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/AngelScript" CACHE PATH "The AngelScript
include path to use")
+ set(ANGELSCRIPT_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/AngelScript" CACHE PATH "The AngelScript lib path
to use")
+ set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE STRING
"The AngelScript lib to link against")
+ endif(ROR_USE_ANGELSCRIPT)
- if(ROR_BUILD_INSTALLER)
- set(WXWIDGETS_STATIC_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/wxWidgets" CACHE PATH "The wxWidgets (static)
include paths to use")
- set(WXWIDGETS_STATIC_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/wx/static" CACHE PATH "The wxWidgets (static) lib
path to use")
- set(WXWIDGETS_STATIC_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxmsw29u_adv.lib;wxbase29u_net.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32"
CACHE STRING "The wxWidgets(shared) libs to link against")
- endif(ROR_BUILD_INSTALLER)
+ if(ROR_USE_HYDRAX)
+ set(HYDRAX_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Hydrax;${ROR_DEPENDENCIES_DIR}/include/" CACHE
PATH "The Hydrax include paths to use")
+ set(HYDRAX_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/Hydrax"
CACHE PATH "The Hydrax lib path to use")
+ set(HYDRAX_LIBRARIES "Hydrax.lib" CACHE STRING "The Hydrax
lib to link against")
+ copy_files(${ROR_DEPENDENCIES_DIR}/bin/Hydrax
${EXECUTABLE_OUTPUT_PATH})
+ endif(ROR_USE_HYDRAX)
- if(ROR_USE_LITESQL)
- set(LITESQL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/litesql" CACHE PATH "The litesql include path
to use")
- set(LITESQL_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/litesql" CACHE PATH "The litesql lib path to use")
- set(LITESQL_LIBRARIES "litesql.lib litesql-util.lib
litesql_sqlite.lib" CACHE STRING "The litesql libs to link against")
- endif(ROR_USE_LITESQL)
-
-
- set(OPENCL_DIR "C:\\ProgramData\\NVIDIA Corporation\\NVIDIA
GPU Computing SDK\\" CACHE PATH "openCL path to use")
+ if(ROR_USE_LITESQL)
+ set(LITESQL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/litesql" CACHE PATH "The litesql include path
to use")
+ set(LITESQL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/litesql"
CACHE PATH "The litesql lib path to use")
+ set(LITESQL_LIBRARIES "litesql.lib litesql-util.lib
litesql_sqlite.lib" CACHE STRING "The litesql libs to link against")
+ endif(ROR_USE_LITESQL)
+
+ set(OPENCL_DIR "C:\\ProgramData\\NVIDIA Corporation\\NVIDIA GPU
Computing SDK\\" CACHE PATH "openCL path to use")
- if(ROR_USE_OPENCL)
- set(OPENCL_INCLUDE_DIRS
"${OPENCL_DIR}/OpenCL/common/inc;${OPENCL_DIR}/shared/inc" CACHE PATH "The
openCL include paths to use")
- set(OPENCL_LIBRARY_DIRS
"${OPENCL_DIR}/shared/lib;${OPENCL_DIR}/OpenCL/common/lib;${OPENCL_DIR}/OpenCL/common/lib/Win32"
CACHE PATH "The openCL lib paths to use")
- set(OPENCL_LIBRARIES
"oclUtils32.lib;shrUtils32.lib;OpenCL.lib" CACHE STRING "The openCL libs to
link against")
- endif(ROR_USE_OPENCL)
-
+ if(ROR_USE_OPENCL)
+ set(OPENCL_INCLUDE_DIRS
"${OPENCL_DIR}/OpenCL/common/inc;${OPENCL_DIR}/shared/inc" CACHE PATH "The
openCL include paths to use")
+ set(OPENCL_LIBRARY_DIRS
"${OPENCL_DIR}/shared/lib;${OPENCL_DIR}/OpenCL/common/lib;${OPENCL_DIR}/OpenCL/common/lib/Win32"
CACHE PATH "The openCL lib paths to use")
+ set(OPENCL_LIBRARIES
"oclUtils32.lib;shrUtils32.lib;OpenCL.lib" CACHE STRING "The openCL libs to
link against")
+ endif(ROR_USE_OPENCL)
+
ELSEIF(UNIX)
find_package(PkgConfig)
PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-01-15 22:29:34 UTC (rev 1566)
+++ trunk/CMakeLists.txt 2011-01-15 22:45:25 UTC (rev 1567)
@@ -7,8 +7,23 @@
project(RoR)
-include(CMakeDependenciesConfig.txt)
+macro(copy_files srcDir destDir)
+ message(STATUS "Configuring ${destDir} ...")
+ #make_directory(${destDir})
+ file(GLOB files RELATIVE ${srcDir} ${srcDir}/*)
+ foreach(filename ${files})
+ set(srcTemplatePath ${srcDir}/${filename})
+ if(NOT IS_DIRECTORY ${srcTemplatePath})
+ message(STATUS "Copying file ${filename}")
+ configure_file(
+ ${srcTemplatePath}
+ ${destDir}/${filename}
+ COPYONLY)
+ endif(NOT IS_DIRECTORY ${srcTemplatePath})
+ endforeach(filename)
+endmacro(copy_files)
+
#setup the default build mode
# global cmake options
@@ -42,7 +57,8 @@
)
if(WIN32)
- # add multi processor compilation flags
+ set(warnings /W3 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /wd4251 /nologo)
+ add_definitions(${warnings})
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP
/GL /Ox /Ob2 /Oi /Ot /Oy /fp:fast /GS- /MP /Zi")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP
/Zi")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP
/Od /Zi")
@@ -55,33 +71,25 @@
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
/DEBUG /LTCG /OPT:REF")
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
"${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DEBUG /LTCG /OPT:REF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /LTCG /OPT:REF")
+
+ # fix executable paths for windows
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY})
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${RUNTIME_OUTPUT_DIRECTORY})
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBUG ${RUNTIME_OUTPUT_DIRECTORY})
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY})
+
ELSEIF(UNIX)
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
-O0 -ggdb")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
-mfpmath=sse -msse2 -mmmx -msse -msse3 -m3dnow -O2 -fomit-frame-pointer
-fstrict-aliasing -ffast-math -ftracer")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
-O0 -ggdb")
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
-mfpmath=sse -msse2 -mmmx -msse -msse3 -m3dnow -O2 -fomit-frame-pointer
-fstrict-aliasing -ffast-math -ftracer")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -O0")
# add additional gdb debugging stuff
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG
"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -O0 -ggdb")
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG
"${CMAKE_MODULE_LINKER_FLAGS_DEBUG} -O0 -ggdb")
-
endif(WIN32)
-macro(copy_files srcDir destDir)
- message(STATUS "Configuring ${destDir} ...")
- #make_directory(${destDir})
+include(CMakeDependenciesConfig.txt)
- file(GLOB files RELATIVE ${srcDir} ${srcDir}/*)
- foreach(filename ${files})
- set(srcTemplatePath ${srcDir}/${filename})
- if(NOT IS_DIRECTORY ${srcTemplatePath})
- message(STATUS "Copying file ${filename}")
- configure_file(
- ${srcTemplatePath}
- ${destDir}/${filename}
- COPYONLY)
- endif(NOT IS_DIRECTORY ${srcTemplatePath})
- endforeach(filename)
-endmacro(copy_files)
add_subdirectory(source)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
