IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of CMAKE_PREFIX_PATH

Browse Source 
Because it was assumed that it contains only a single path; it's specified
to be a semi-colon-separated list of paths.
This commit is contained in:
John Ralls 2017-06-05 14:56:18 -07:00
parent 9d2a4b2ef0
commit 55a30978b3
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -138,8 +138,9 @@ IF (WIN32)
#SET(PKG_CONFIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/gnome/bin/pkg-config.exe) #SET(PKG_CONFIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/gnome/bin/pkg-config.exe)
SET(SWIG_EXECUTABLE swig) SET(SWIG_EXECUTABLE swig)
#SET(SWIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/swig/swig.exe) #SET(SWIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/swig/swig.exe)
SET(REGEX_INCLUDE_PATH ${CMAKE_PREFIX_PATH}/mingw32/include) FIND_PATH(REGEX_INCLUDE_PATH regex.h)
SET(REGEX_LDFLAGS "-L${CMAKE_PREFIX_PATH}/mingw32/lib -lregex") FIND_PATH(REGEX_LIB_PATH libregex.dll.a)
SET(REGEX_LDFLAGS "-L${REGEX_LIB_PATH} -lregex")
#SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include) #SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include)
#SET(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc) #SET(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc)
# I have not yet debugged the intltool-merge file generation process on Windows. # I have not yet debugged the intltool-merge file generation process on Windows.
@ -710,7 +711,9 @@ INSTALL(CODE
#For windows, copy in some DLLs from Mingw #For windows, copy in some DLLs from Mingw
IF (WIN32) IF (WIN32)
SET(MINGW_DLLS ${CMAKE_PREFIX_PATH}/mingw32/bin/libstdc++-6.dll ${CMAKE_PREFIX_PATH}/mingw32/bin/libgcc_s_dw2-1.dll) FIND_LIBRARY(LIBSTDC++ libstdc++-6.dll)
FIND_LIBRARY(LIBDW2 libgcc_s_dw2-1.dll)
SET(MINGW_DLLS ${LIBSTDC++} ${LIBDW2})
INSTALL(PROGRAMS ${MINGW_DLLS} DESTINATION bin) INSTALL(PROGRAMS ${MINGW_DLLS} DESTINATION bin)
FILE(COPY ${MINGW_DLLS} DESTINATION ${BINDIR_BUILD} FILE(COPY ${MINGW_DLLS} DESTINATION ${BINDIR_BUILD}
# Do permissions matter for windows? # Do permissions matter for windows?

20
src/bin/CMakeLists.txt
View File

@ -149,17 +149,17 @@ IF (WIN32)
LIST(APPEND CMD_LINES "set PATH=${INSTALL_PATH_ITEM}\;%PATH%\n") LIST(APPEND CMD_LINES "set PATH=${INSTALL_PATH_ITEM}\;%PATH%\n")
LIST(APPEND BUILD_CMD_LINES "set PATH=${BUILD_PATH_ITEM}\;%PATH%\n") LIST(APPEND BUILD_CMD_LINES "set PATH=${BUILD_PATH_ITEM}\;%PATH%\n")
ENDFOREACH(dir) ENDFOREACH(dir)
IF (NOT ${MINGW64})
FOREACH(dir ${lib_directories})
FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/lib PATH_ITEM)
LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
ENDFOREACH(dir)
FOREACH(dir ${lib_directories}) FOREACH(dir ${bin_directories})
FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/lib PATH_ITEM) FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/bin PATH_ITEM)
LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n") LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
ENDFOREACH(dir) ENDFOREACH(dir)
ENDIF (NOT ${MINGW64})
FOREACH(dir ${bin_directories})
FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/bin PATH_ITEM)
LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
ENDFOREACH(dir)
SET(CMD_FILE ${CMAKE_CURRENT_BINARY_DIR}/gnucash-launcher.cmd) SET(CMD_FILE ${CMAKE_CURRENT_BINARY_DIR}/gnucash-launcher.cmd)
FILE(WRITE ${CMD_FILE} "@echo off\nsetlocal\n\n") FILE(WRITE ${CMD_FILE} "@echo off\nsetlocal\n\n")
FOREACH(line ${CMD_LINES}) FOREACH(line ${CMD_LINES})