From 26c9c40e3d8765c57492259f251fbc82737d9cb2 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Fri, 21 Sep 2012 18:08:22 -0400
Subject: [PATCH] added python.exe and puic4.bat to the corresponding
find_programm calls fixed windows install statements to install dll instead
of lib file
---
cmake_support/FindPython.cmake | 2 +-
cmake_support/OST.cmake | 9 ++-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/cmake_support/FindPython.cmake b/cmake_support/FindPython.cmake
index 09a87104f..702744428 100644
--- a/cmake_support/FindPython.cmake
+++ b/cmake_support/FindPython.cmake
@@ -72,7 +72,7 @@ macro(_find_python_bin PYTHON_ROOT VERSION)
string(REPLACE "." "" _VERSION_NO_DOTS "${VERSION}")
if(PYTHON_ROOT)
find_program(PYTHON_BINARY
- NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}"
+ NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}" python.exe
HINTS "${PYTHON_ROOT}"
PATH_SUFFIXES bin
NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH
diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 3545c6431..5b292e13f 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -243,8 +243,7 @@ macro(module)
INSTALL_NAME_DIR "@rpath")
endif()
if (WIN32)
- #set_target_properties(${_LIB_NAME} PROPERTIES PREFIX "../")
- install(TARGETS ${_LIB_NAME} ARCHIVE DESTINATION "${LIB_DIR}")
+ install(TARGETS ${_LIB_NAME} RUNTIME DESTINATION bin)
else()
if (ENABLE_STATIC)
install(TARGETS ${_LIB_NAME} ARCHIVE DESTINATION "${LIB_DIR}")
@@ -447,7 +446,7 @@ macro(ui_to_python LIBNAME PYMODDIR STAGEDIR)
add_custom_target("${LIBNAME}_ui" ALL)
add_dependencies("_${LIBNAME}" "${LIBNAME}_ui")
find_program(_PYUIC_EXECUTABLE
- NAMES pyuic4-${PYTHON_VERSION} pyuic4 pyuic
+ NAMES pyuic4-${PYTHON_VERSION} pyuic4 pyuic pyuic4.bat
PATHS ENV PATH
)
if(NOT _PYUIC_EXECUTABLE)
@@ -570,12 +569,8 @@ macro(pymod)
set_target_properties("_${_LIB_NAME}"
PROPERTIES PREFIX "")
else ()
- set_target_properties("_${_LIB_NAME}"
- PROPERTIES PREFIX "../")
-
set_target_properties("_${_LIB_NAME}"
PROPERTIES SUFFIX ".pyd")
-
endif()
install(TARGETS "_${_LIB_NAME}" LIBRARY DESTINATION
"${LIB_DIR}/${PYMOD_DIR}")
--
GitLab