Initial work for a PKG http service

[flightgear.git] / CMakeModules / ConfigureMsvc3rdParty.cmake

diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake
index 1230ef30bfec92f1df6b7df3e50e5568ff666441..67c37dee3ec7756df3cde2079c21b6694d44e425 100644 (file)
--- a/CMakeModules/ConfigureMsvc3rdParty.cmake
+++ b/CMakeModules/ConfigureMsvc3rdParty.cmake
@@ -1,7 +1,7 @@
 # ConfigureMsvc3rdParty.cmake - Configure 3rd Party Library Paths on Windows
 
 if (MSVC)
-    GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
+    GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
     if (CMAKE_CL_64)
         SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
     else (CMAKE_CL_64)
@@ -12,7 +12,7 @@ if (MSVC)
     else (EXISTS ${TEST_3RDPARTY_DIR})
         set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
     endif (EXISTS ${TEST_3RDPARTY_DIR})
-        list(APPEND PLATFORM_LIBS "winmm.lib")
+    list(APPEND PLATFORM_LIBS "winmm.lib")
 else (MSVC)
     set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 endif (MSVC)
@@ -20,11 +20,13 @@ endif (MSVC)
 if (MSVC AND MSVC_3RDPARTY_ROOT)
     message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
     set( OSG_MSVC "msvc" )
-    if (${MSVC_VERSION} EQUAL 1600)
+    if (${MSVC_VERSION} EQUAL 1700)
+        set( OSG_MSVC ${OSG_MSVC}110 )
+    elseif (${MSVC_VERSION} EQUAL 1600)
         set( OSG_MSVC ${OSG_MSVC}100 )
-    else (${MSVC_VERSION} EQUAL 1600)
+    else (${MSVC_VERSION} EQUAL 1700)
         set( OSG_MSVC ${OSG_MSVC}90 )
-    endif (${MSVC_VERSION} EQUAL 1600)
+    endif (${MSVC_VERSION} EQUAL 1700)
     if (CMAKE_CL_64)
         set( OSG_MSVC ${OSG_MSVC}-64 )
         set( MSVC_3RDPARTY_DIR 3rdParty.x64 )
@@ -33,10 +35,29 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
         set( MSVC_3RDPARTY_DIR 3rdParty )
                set( BOOST_LIB lib )
     endif (CMAKE_CL_64)
+    find_path(FLTK_DIR include/FL/Fl.H
+                       ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/fltk
+                       ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/fltk-1.3
+                       ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}
+                       )
+       list (APPEND CMAKE_PROGRAM_PATH ${FLTK_DIR}/bin)
 
-    set (CMAKE_LIBRARY_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/lib $(BOOST_ROOT)/$(BOOST_LIB) )
-    set (CMAKE_INCLUDE_PATH ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include)
-    set (BOOST_ROOT         ${MSVC_3RDPARTY_ROOT}/boost_1_44_0)
+    set (CMAKE_LIBRARY_PATH ${FLTK_DIR}/lib ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenRTI/lib ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/lib $(BOOST_ROOT)/$(BOOST_LIB) )
+    set (CMAKE_INCLUDE_PATH ${FLTK_DIR}/include ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenScenegraph/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/OpenRTI/include ${MSVC_3RDPARTY_ROOT}/install/${OSG_MSVC}/SimGear/include)
+    find_path(BOOST_ROOT boost/version.hpp
+                       ${MSVC_3RDPARTY_ROOT}/boost
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_52_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_51_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_50_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_49_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_48_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_47_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_46_1
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_46_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_45_0
+                       ${MSVC_3RDPARTY_ROOT}/boost_1_44_0
+                       )
+    message(STATUS "BOOST_ROOT is ${BOOST_ROOT}")
     set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
     set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
 endif (MSVC AND MSVC_3RDPARTY_ROOT)