Skip to content

Commit

Permalink
cmake: move wx funcs and macros into separate file
Browse files Browse the repository at this point in the history 
In 2097b5a I added a function that is used both in the non-vcpkg block
and outside of it, but the function was defined in the non-vcpkg block,
and this broke the visual studio build.

Move functions and macros into an include file so that they are globally
available.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
  • Loading branch information
@rkitover
rkitover committed Apr 9, 2019
1 parent 468fe26 commit 2beb561
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 116 deletions.
115 changes: 115 additions & 0 deletions cmake/VbamFunctions.cmake
View file
Expand Up @@ -4,3 +4,118 @@ function(JOIN VALUES GLUE OUTPUT)
string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
endfunction()

# convert msys paths like /c/foo to windows paths like c:/foo
# for variables set by FindWxWidgets
function(normalize_wx_paths)
if(MSYS)
unset(new_paths)
foreach(p ${wxWidgets_LIBRARY_DIRS})
execute_process(COMMAND cygpath -m "${p}" OUTPUT_VARIABLE p_win OUTPUT_STRIP_TRAILING_WHITESPACE)
list(APPEND new_paths "${p_win}")
endforeach()

set(wxWidgets_LIBRARY_DIRS ${new_paths} PARENT_SCOPE)

string(REGEX REPLACE "((^| )[^/]*)/([a-zA-Z])/" "\\1\\3:/" new_libs "${wxWidgets_LIBRARIES}")

set(wxWidgets_LIBRARIES ${new_libs} PARENT_SCOPE)
endif()
endfunction()

macro(cleanup_wx_vars)
if(wxWidgets_CXX_FLAGS)
list(REMOVE_ITEM wxWidgets_CXX_FLAGS -fpermissive)
endif()
endmacro()

function(cygpath var path)
execute_process(
COMMAND cygpath -m ${path}
OUTPUT_VARIABLE cyg_path
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
set(${var} ${cyg_path} PARENT_SCOPE)
endfunction()

function(check_clean_exit var)
execute_process(
COMMAND ${ARGN}
RESULT_VARIABLE exit_status
OUTPUT_QUIET
ERROR_QUIET
)

if(NOT ${exit_status} EQUAL 0)
# special case for msys2, where programs might complain about
# not being win32 programs
unset(cmd_str)
foreach(param IN LISTS ARGN)
set(cmd_str "${cmd_str} ${param}")
endforeach()
string(STRIP "${cmd_str}" cmd_str)

execute_process(
COMMAND sh -c "${cmd_str}"
RESULT_VARIABLE exit_status
OUTPUT_QUIET
ERROR_QUIET
)
endif()

set(${var} ${exit_status} PARENT_SCOPE)
endfunction()

function(find_wx_util var util)
# on win32, including cross builds we prefer the plain utility name first from PATH
if(WIN32)
set(conf_suffixes "" gtk4 gtk3)
set(major_versions "" 4 3 2)
else()
set(conf_suffixes gtk4 gtk3 "")
set(major_versions 4 3 2 "")
endif()

foreach(conf_suffix IN LISTS conf_suffixes)
foreach(major_version IN LISTS major_versions)
foreach(minor_version RANGE 100 0 -1)
unset(suffix)
if(conf_suffix)
set(suffix "-${conf_suffix}")
endif()
if(major_version)
set(suffix "${suffix}-${major_version}")

if(NOT minor_version EQUAL 0)
set(suffix "${suffix}.${minor_version}")
endif()
endif()

# find_program caches the result
set(exe NOTFOUND CACHE INTERNAL "" FORCE)
find_program(exe NAMES "${util}${suffix}")

if(EXISTS ${exe})
# check that the utility can be executed cleanly
# in case we find e.g. the wrong architecture binary
# when cross-compiling
check_clean_exit(exit_status ${exe} --help)

if(exit_status EQUAL 0)
set(${var} ${exe} PARENT_SCOPE)
return()
endif()
endif()

# don't iterate over minor versions for empty major version
if(major_version STREQUAL "")
break()
endif()
endforeach()
endforeach()

# default to util name if not found, so the error is more clear
set(${var} ${util} PARENT_SCOPE)
endforeach()
endfunction()
115 changes: 0 additions & 115 deletions src/wx/CMakeLists.txt
View file
Expand Up @@ -126,127 +126,12 @@ else()
# set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -luuid -lwinspool")
#endif()

# convert msys paths like /c/foo to windows paths like c:/foo
# for variables set by FindWxWidgets
function(normalize_wx_paths)
if(MSYS)
unset(new_paths)
foreach(p ${wxWidgets_LIBRARY_DIRS})
execute_process(COMMAND cygpath -m "${p}" OUTPUT_VARIABLE p_win OUTPUT_STRIP_TRAILING_WHITESPACE)
list(APPEND new_paths "${p_win}")
endforeach()

set(wxWidgets_LIBRARY_DIRS ${new_paths} PARENT_SCOPE)

string(REGEX REPLACE "((^| )[^/]*)/([a-zA-Z])/" "\\1\\3:/" new_libs "${wxWidgets_LIBRARIES}")

set(wxWidgets_LIBRARIES ${new_libs} PARENT_SCOPE)
endif()
endfunction()

macro(cleanup_wx_vars)
if(wxWidgets_CXX_FLAGS)
list(REMOVE_ITEM wxWidgets_CXX_FLAGS -fpermissive)
endif()
endmacro()

if(CMAKE_PREFIX_PATH)
set(wxWidgets_CONFIG_OPTIONS "--prefix=${CMAKE_PREFIX_PATH}")
endif()

set(wxWidgets_USE_UNICODE ON)

function(cygpath var path)
execute_process(
COMMAND cygpath -m ${path}
OUTPUT_VARIABLE cyg_path
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
set(${var} ${cyg_path} PARENT_SCOPE)
endfunction()

function(check_clean_exit var)
execute_process(
COMMAND ${ARGN}
RESULT_VARIABLE exit_status
OUTPUT_QUIET
ERROR_QUIET
)

if(NOT ${exit_status} EQUAL 0)
# special case for msys2, where programs might complain about
# not being win32 programs
unset(cmd_str)
foreach(param IN LISTS ARGN)
set(cmd_str "${cmd_str} ${param}")
endforeach()
string(STRIP "${cmd_str}" cmd_str)

execute_process(
COMMAND sh -c "${cmd_str}"
RESULT_VARIABLE exit_status
OUTPUT_QUIET
ERROR_QUIET
)
endif()

set(${var} ${exit_status} PARENT_SCOPE)
endfunction()

function(find_wx_util var util)
# on win32, including cross builds we prefer the plain utility name first from PATH
if(WIN32)
set(conf_suffixes "" gtk4 gtk3)
set(major_versions "" 4 3 2)
else()
set(conf_suffixes gtk4 gtk3 "")
set(major_versions 4 3 2 "")
endif()

foreach(conf_suffix IN LISTS conf_suffixes)
foreach(major_version IN LISTS major_versions)
foreach(minor_version RANGE 100 0 -1)
unset(suffix)
if(conf_suffix)
set(suffix "-${conf_suffix}")
endif()
if(major_version)
set(suffix "${suffix}-${major_version}")

if(NOT minor_version EQUAL 0)
set(suffix "${suffix}.${minor_version}")
endif()
endif()

# find_program caches the result
set(exe NOTFOUND CACHE INTERNAL "" FORCE)
find_program(exe NAMES "${util}${suffix}")

if(EXISTS ${exe})
# check that the utility can be executed cleanly
# in case we find e.g. the wrong architecture binary
# when cross-compiling
check_clean_exit(exit_status ${exe} --help)

if(exit_status EQUAL 0)
set(${var} ${exe} PARENT_SCOPE)
return()
endif()
endif()

# don't iterate over minor versions for empty major version
if(major_version STREQUAL "")
break()
endif()
endforeach()
endforeach()

# default to util name if not found, so the error is more clear
set(${var} ${util} PARENT_SCOPE)
endforeach()
endfunction()

# Check for gtk4 then gtk3 packages first, some dists like arch rename the
# wx-config utility for these packages to e.g. wx-config-gtk3
#
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 32 files
+0 −4 ports/cli/CONTROL
+0 −20 ports/cli/portfile.cmake
+1 −1 ports/darknet/CONTROL
+37 −0 ports/darknet/dont_use_integrated_stb_lib.patch
+14 −0 ports/darknet/enable_standard_installation.patch
+0 −49 ports/darknet/fix_cmakelists.patch
+8 −6 ports/darknet/portfile.cmake
+1 −1 ports/draco/CONTROL
+0 −30 ports/draco/fix-compile-error-uwp.patch
+0 −2 ports/draco/portfile.cmake
+1 −1 ports/freeopcua/CONTROL
+25 −59 ports/freeopcua/cmakelists_fixes.patch
+3 −2 ports/freeopcua/portfile.cmake
+1 −1 ports/grpc/CONTROL
+2 −2 ports/grpc/portfile.cmake
+0 −4 ports/kd-soap/CONTROL
+0 −12 ports/kd-soap/kd-saop.patch
+0 −31 ports/kd-soap/portfile.cmake
+1 −1 ports/qt5-modularscripts/CONTROL
+1 −9 ports/qt5-modularscripts/qt_modular_library.cmake
+0 −5 ports/qt5-mqtt/CONTROL
+0 −21 ports/qt5-mqtt/portfile.cmake
+1 −1 ports/qt5/CONTROL
+1 −1 ports/rttr/CONTROL
+14 −0 ports/rttr/disable-unit-tests.patch
+8 −11 ports/rttr/fix-directory-output.patch
+4 −10 ports/rttr/portfile.cmake
+41 −44 ports/rttr/remove-owner-read-perms.patch
+1 −1 ports/tiff/CONTROL
+0 −2 ports/tiff/portfile.cmake
+43 −49 scripts/cmake/vcpkg_test_cmake.cmake
+6 −1 toolsrc/include/vcpkg/base/files.h

0 comments on commit 2beb561

Please sign in to comment.