cmake: remove set_lib_path macro
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Jun 2013 18:15:56 +0000 (18:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Jun 2013 18:15:56 +0000 (18:15 +0000)
CMakeLists.txt
build_files/cmake/macros.cmake
source/creator/CMakeLists.txt

index b7957badcd9665b851dd060f82d8df76ddce73fb..16d00dd4b54d1af544e9fdbf7b60f03ad87838dc 100644 (file)
@@ -1124,26 +1124,22 @@ elseif(WIN32)
                                ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
                                ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
                        )
-                       set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
                        set(OPENCOLLADA_LIBRARIES
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+                               ${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+                               ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+                               ${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+                               ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+                               ${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+                               ${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+                               ${OPENCOLLADA}/lib/opencollada/xml.lib
+                               ${OPENCOLLADA}/lib/opencollada/buffer.lib
+                               ${OPENCOLLADA}/lib/opencollada/ftoa.lib
+                               ${OPENCOLLADA}/lib/opencollada/UTF.lib
                        )
                        set(PCRE_LIBRARIES
-                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+                               ${OPENCOLLADA}/lib/opencollada/pcre.lib
                        )
-                       
-                       unset(OPENCOLLADA_LIBPATH)
-                       
                endif()
 
                if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@ elseif(WIN32)
                endif()
 
                if(WITH_IMAGE_OPENEXR)
-                       set_lib_path(OPENEXR "openexr")
+                       set(OPENEXR ${LIBDIR}/openexr)
                        set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
                        set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
                        set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1201,11 +1197,9 @@ elseif(WIN32)
                if(WITH_PYTHON)
                        set(PYTHON_VERSION 3.3) # CACHE STRING)
 
-                       set_lib_path(PYTHON "python")
                        string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
                        # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
                        set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
-                       # set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
                        unset(_PYTHON_VERSION_NO_DOTS)
 
                        # Shared includes for both vc2008 and vc2010
index 9f874581301a609b46ed2760bfe8f52490e69a4c..b1dd76fbd14eceab83cf2fd25ecca48f4c01e444 100644 (file)
@@ -751,12 +751,6 @@ function(delayed_do_install
        endif()
 endfunction()
 
-macro(set_lib_path
-               lvar
-               lproj)
-               set(${lvar} ${LIBDIR}/${lproj})
-endmacro()
-
 
 macro(data_to_c
       file_from file_to
index 7c744d10d63a9d7c0879bd86203ac596683106d0..8ff4ec445ea2e755239a9c830943a005bb72d37e 100644 (file)
@@ -488,18 +488,16 @@ elseif(WIN32)
        )
 
        if(WITH_PYTHON)
-               set_lib_path(PYLIB "python")
-
                string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
                install(
-                       FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
+                       FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
                )
 
                install(
-                       FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
+                       FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Debug
                )