mac os fixes
This commit is contained in:
parent
75c61fe193
commit
0d5f0b67dd
|
@ -1 +1,2 @@
|
||||||
build/*
|
build/*
|
||||||
|
.DS_Store
|
|
@ -10,6 +10,3 @@
|
||||||
[submodule "vendor/mbedtls"]
|
[submodule "vendor/mbedtls"]
|
||||||
path = vendor/mbedtls
|
path = vendor/mbedtls
|
||||||
url = https://github.com/Mbed-TLS/mbedtls.git
|
url = https://github.com/Mbed-TLS/mbedtls.git
|
||||||
[submodule "vendor/wxWidgets"]
|
|
||||||
path = vendor/wxWidgets
|
|
||||||
url = https://github.com/wxWidgets/wxWidgets.git
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
cmake_minimum_required (VERSION 3.8)
|
cmake_minimum_required (VERSION 3.8)
|
||||||
project ("globalRPC")
|
if(APPLE)
|
||||||
|
project ("globalRPC" LANGUAGES C CXX OBJCXX)
|
||||||
|
else()
|
||||||
|
project ("globalRPC" LANGUAGES C CXX)
|
||||||
|
endif()
|
||||||
file(GLOB_RECURSE SOURCES "src/*.cpp")
|
file(GLOB_RECURSE SOURCES "src/*.cpp")
|
||||||
add_executable (rpc ${SOURCES})
|
add_executable (rpc ${SOURCES})
|
||||||
set_property(TARGET rpc PROPERTY CXX_STANDARD 20)
|
set_property(TARGET rpc PROPERTY CXX_STANDARD 20)
|
||||||
|
@ -11,6 +15,7 @@ endif()
|
||||||
file(GLOB wx_setup_dir
|
file(GLOB wx_setup_dir
|
||||||
"${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/mswu"
|
"${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/mswu"
|
||||||
"${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/gtk3u"
|
"${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/*/gtk3u"
|
||||||
|
"${CMAKE_BINARY_DIR}/vendor/wxWidgets/lib/wx/include/*"
|
||||||
)
|
)
|
||||||
if(wx_setup_dir)
|
if(wx_setup_dir)
|
||||||
message(STATUS "wxWidgets setup.h directory found: ${wx_setup_dir}")
|
message(STATUS "wxWidgets setup.h directory found: ${wx_setup_dir}")
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a
|
|
Loading…
Reference in New Issue