diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-10 09:10:53 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-10 09:10:53 +0000 |
| commit | 526f7cf367e89fcadb96cd5e92d9364ba619bdfe (patch) | |
| tree | 8c381642a918f230079eef4f0d22b9864d8a528e | |
| parent | 7af36bb2db33a44ddd6ab9f8a352e8c885a947f5 (diff) | |
The path approach can't work this way: Trying to set an environment
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.
Hard code the QT5 search path on Windows for now.
svn path=/trunk/; revision=52489
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a60e8b1b44..3d13c4233c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,6 +355,11 @@ if(BUILD_qtshark) if(ENABLE_QT5) set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools) set(QT_VERSION 5) + # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten + # somewhere. The if WIN32 in this place is annoying as well. + if( WIN32 ) + set(CMAKE_PREFIX_PATH "C:\\Qt\\Qt5.1.1\\5.1.1\\msvc2010\\") + endif() else() set(PACKAGELIST ${PACKAGELIST} Qt4) # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui) @@ -467,27 +472,6 @@ foreach(PACKAGE ${PACKAGELIST}) endif() endforeach() -# Add paths required to run the executables inside the build dir - -if(WIN32) - if( "$ENV{PATH}" MATCHES "${CMAKE_BINARY_DIR}/lib") - message( STATUS "Build dir (${CMAKE_BINARY_DIR}/lib) already in path." ) - else() - # message( STATUS "All libs: ${WS_ALL_LIBS}\n" ) - foreach( THIS_LIB_PATH ${WS_ALL_LIBS} ) - get_filename_component( LIB_PATH ${THIS_LIB_PATH} PATH ) - # message( STATUS "Raw path ${THIS_LIB_PATH} processed to ${LIB_PATH}." ) - set( WS_LOCAL_LIB_PATHS ${WS_LOCAL_LIB_PATHS} ${LIB_PATH} ) - endforeach() - list(REMOVE_DUPLICATES WS_LOCAL_LIB_PATHS) - # All generated libs go here, so start our libsearch in this place - set(WS_LOCAL_LIB_PATHS "${CMAKE_BINARY_DIR}/lib" ${WS_LOCAL_LIB_PATHS}) - message( STATUS "Adding paths: ${WS_LOCAL_LIB_PATHS}" ) - set( ENV{PATH} $ENV{PATH} ${WS_LOCAL_LIB_PATHS} ) - endif() -endif() - - # Provide Windows system lib names include( UseWinLibs ) |