Browse Source

Merge pull request #337 from Mystler/cmake-python

Fix CMake warnings for Python libraries.
Joseph Davies 11 years ago
parent
commit
ee1139cad2
  1. 2
      CMakeLists.txt
  2. 8
      Sources/Plasma/Apps/plClient/CMakeLists.txt
  3. 8
      Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
  4. 3
      Sources/Tools/MaxMain/CMakeLists.txt

2
CMakeLists.txt

@ -1,5 +1,5 @@
project(Plasma)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.8)
# Set up Product Identification parameters
set(PRODUCT_BRANCH_ID "1" CACHE STRING "Branch ID")

8
Sources/Plasma/Apps/plClient/CMakeLists.txt

@ -153,13 +153,7 @@ target_link_libraries(plClient pnTimer)
target_link_libraries(plClient pnUtils)
target_link_libraries(plClient pnUUID)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plClient optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(plClient ${PYTHON_LIBRARY})
endif()
target_link_libraries(plClient ${PYTHON_LIBRARIES})
target_link_libraries(plClient ${OPENAL_LIBRARY})
target_link_libraries(plClient ${OPENSSL_LIBRARIES})
target_link_libraries(plClient ${EXPAT_LIBRARY})

8
Sources/Plasma/Apps/plPythonPack/CMakeLists.txt

@ -14,13 +14,7 @@ set(plPythonPack_HEADERS
add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS})
target_link_libraries(plPythonPack CoreLib plFile)
if(PYTHON_DEBUG_LIBRARY)
target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY})
else()
target_link_libraries(plPythonPack ${PYTHON_LIBRARY})
endif()
target_link_libraries(plPythonPack ${PYTHON_LIBRARIES})
if(USE_VLD)
target_link_libraries(plPythonPack ${VLD_LIBRARY})

3
Sources/Tools/MaxMain/CMakeLists.txt

@ -103,8 +103,7 @@ target_link_libraries(MaxMain ${Ogg_LIBRARIES})
target_link_libraries(MaxMain ${OPENAL_LIBRARY})
target_link_libraries(MaxMain ${OPENSSL_LIBRARIES})
target_link_libraries(MaxMain ${PHYSX_LIBRARIES})
target_link_libraries(MaxMain debug ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(MaxMain optimized ${PYTHON_LIBRARY})
target_link_libraries(MaxMain ${PYTHON_LIBRARIES})
target_link_libraries(MaxMain ${Speex_LIBRARY})
target_link_libraries(MaxMain ${Vorbis_LIBRARIES})

Loading…
Cancel
Save