mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/TanninOne/master'

Browse Source
This commit is contained in:
Thomas Tanner
2015-11-18 20:46:19 +00:00
parent 07798f2e23 fe2169650e
commit f6d499e6c6
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+7 -2
View File
@@ -21,8 +21,13 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} DIRECTORY)
# need to install python
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin)
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb)
IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll")
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin)
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb)
ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll")
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin)
INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb)
ENDIF()
ADD_SUBDIRECTORY(src/runner)
src/proxy/CMakeLists.txt
+2 -2
View File
@@ -26,12 +26,12 @@ SET(default_project_path "${CMAKE_SOURCE_DIR}/../..")
GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
SET(lib_path "${project_path}/../install/libs")
SET(lib_path "${project_path}/../../install/libs")
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
INCLUDE_DIRECTORIES(${project_path}/uibase/src
${project_path}/plugin/plugin_python/src/runner/
${project_path}/plugin_python/src/runner/
${PYTHON_ROOT}/Include
${PYTHON_ROOT}/PC)
LINK_DIRECTORIES(${lib_path})
src/runner/CMakeLists.txt
+4 -2
View File
@@ -25,11 +25,13 @@ IF (Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
ENDIF (Boost_FOUND)
SET(default_project_path "${CMAKE_SOURCE_DIR}/../..")
SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
SET(lib_path "${project_path}/../install/libs")
SET(lib_path "${project_path}/../../install/libs")
MESSAGE(STATUS "${Boost_LIBRARY_DIRS}")
INCLUDE_DIRECTORIES(${project_path}/uibase/src
${PYTHON_ROOT}/Include