cmake: fix for recent break in msvc+collada, also dont cache duplicate python include...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Jun 2011 13:06:21 +0000 (13:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Jun 2011 13:06:21 +0000 (13:06 +0000)
CMakeLists.txt
build_files/cmake/Modules/FindPythonLibsUnix.cmake

index 513211a07da747d37eb95dc5b2c945dd5439d763..c58ff1f4ed8a8d8c5a5c3bb7e73d3dd08286fad4 100644 (file)
@@ -608,13 +608,24 @@ elseif(WIN32)
                endif()
 
                if(WITH_OPENCOLLADA)
                endif()
 
                if(WITH_OPENCOLLADA)
-                       set(OPENCOLLADA ${LIBDIR}/opencollada)
-                       set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
-                       set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-                       set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
+                       set(OPENCOLLADA_INCLUDE_DIR
+                               ${LIBDIR}/opencollada/include
+                       )
+                       set(OPENCOLLADA_LIBRARIES
+                               ${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
+                               ${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
+                               ${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
+                               ${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
+                               ${LIBDIR}/opencollada/lib/MathMLSolver.lib
+                               ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
+                               ${LIBDIR}/opencollada/lib/xml2.lib
+                               ${LIBDIR}/opencollada/lib/buffer.lib
+                               ${LIBDIR}/opencollada/lib/ftoa.lib
+                               ${LIBDIR}/opencollada/lib/UTF.lib
+                       )
                        set(PCRE_LIB pcre)
                endif()
                        set(PCRE_LIB pcre)
                endif()
-       
+
                if(WITH_CODEC_FFMPEG)
                        set(FFMPEG ${LIBDIR}/ffmpeg)
                        set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/msvc)
                if(WITH_CODEC_FFMPEG)
                        set(FFMPEG ${LIBDIR}/ffmpeg)
                        set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/msvc)
index 2a4133581a73137986bb4b3396e0853971e73ebb..489b13b15fd87446645935fc628b0b286445b8bf 100644 (file)
@@ -77,8 +77,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
 
 if(PYTHONLIBSUNIX_FOUND)
        # Assign cache items
 
 if(PYTHONLIBSUNIX_FOUND)
        # Assign cache items
-       set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} CACHE STRING "")
-       set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} CACHE STRING "")
+       set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+       set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
 
        # we need this for installation
        get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
 
        # we need this for installation
        get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
@@ -87,10 +87,7 @@ if(PYTHONLIBSUNIX_FOUND)
        # set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 
        mark_as_advanced(
        # set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 
        mark_as_advanced(
-               PYTHON_INCLUDE_DIRS
                PYTHON_INCLUDE_DIR
                PYTHON_INCLUDE_DIR
-               PYTHON_LIBRARIES
                PYTHON_LIBRARY
                PYTHON_LIBRARY
-               PYTHON_LIBPATH
        )
 endif()
        )
 endif()