diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-01-12 15:22:28 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-01-12 15:22:28 (GMT) |
| commit | 9e7e73725c20fbc95dccd9c1477a4d7c907be321 (patch) | |
| tree | 46de1569973e684e41da701e7b6e7162587faf42 | |
| parent | 7aa7095d17a180d663cd9647c31d99d97c1dca4f (diff) | |
| download | uscxml-9e7e73725c20fbc95dccd9c1477a4d7c907be321.zip uscxml-9e7e73725c20fbc95dccd9c1477a4d7c907be321.tar.gz uscxml-9e7e73725c20fbc95dccd9c1477a4d7c907be321.tar.bz2 | |
Bumped version string to 0.0.3
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1067dd2..c7d0ca2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.4) # specify USCXML version SET(USCXML_VERSION_MAJOR "0") SET(USCXML_VERSION_MINOR "0") -SET(USCXML_VERSION_PATCH "2") +SET(USCXML_VERSION_PATCH "3") SET(USCXML_VERSION ${USCXML_VERSION_MAJOR}.${USCXML_VERSION_MINOR}.${USCXML_VERSION_PATCH}) # build type has to be set before the project definition @@ -161,6 +161,8 @@ OPTION(DIST_PREPARE "Put libraries into the lib folder of the source tree" OFF) # where to find the cmake modules we distribute set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/contrib/cmake) include("${CMAKE_MODULE_PATH}/USCXMLMacros.cmake") +include("${CMAKE_MODULE_PATH}/FunctionExists.cmake") +include("${CMAKE_MODULE_PATH}/HeaderExists.cmake") # some compiler flags #message("CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}") @@ -548,6 +550,10 @@ endif() # OpenSceneGraph invoker if (UNIX) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) # link dynamically! +elseif(WIN32) + if (ENV{OSG_ROOT} STREQUAL "") + set(ENV{OSG_ROOT} "C:/Program Files/OpenSceneGraph-3.0.1") + endif() endif() find_package(OpenSceneGraph COMPONENTS osgViewer osgGA osgText osgFX osgManipulator osgDB osgUtil OpenThreads) |