Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

start emake release #107

Merged
merged 38 commits into from
Apr 9, 2020
Merged

start emake release #107

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
124df96
start emake release
Mar 20, 2020
d39c172
build emake
Mar 23, 2020
81c9cb3
merge master
Mar 23, 2020
8d96b91
update submodule
Mar 23, 2020
610fa38
Update ci-build.sh
fundies Mar 23, 2020
435a11a
Update ServerPlugin.cpp
fundies Mar 24, 2020
fbecc6e
Update CMakeLists.txt
fundies Mar 24, 2020
7fd0034
Update CMakeLists.txt
fundies Mar 24, 2020
cadb4a1
Update CMakeLists.txt
fundies Mar 24, 2020
2792f7b
Update ServerPlugin.cpp
fundies Mar 24, 2020
ade17aa
Update ci-build.sh
fundies Mar 24, 2020
d29092f
Update CMakeLists.txt
fundies Mar 24, 2020
d86b543
Append path, not replace it.
RobertBColton Apr 1, 2020
1200733
Actually capture MSYS2 environment.
RobertBColton Apr 1, 2020
1bedc92
oopsie
RobertBColton Apr 1, 2020
68465f7
Actually capture the MSYS2 environment.
RobertBColton Apr 1, 2020
dd94de7
best guess at hack
fundies Apr 1, 2020
82882bb
Update azure-jobs.yml
fundies Apr 1, 2020
289d739
noquote
RobertBColton Apr 2, 2020
f2d1ba0
Update CMakeLists.txt
fundies Apr 3, 2020
fec0ba0
Log QProcess standard output & error
RobertBColton Apr 5, 2020
140fdf3
Update ServerPlugin.cpp
RobertBColton Apr 6, 2020
638b461
Update ServerPlugin.cpp
RobertBColton Apr 6, 2020
05974fb
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
f0f64ff
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
7265a15
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
e200f26
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
f882884
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
5712ff5
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
1c0c3e2
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
1ab7ca0
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
dec11be
Update ServerPlugin.cpp
RobertBColton Apr 7, 2020
4463e12
Update ServerPlugin.cpp
RobertBColton Apr 8, 2020
1e945b4
oopsie
RobertBColton Apr 8, 2020
c055532
use boolean operators
RobertBColton Apr 9, 2020
dc8723e
Use cmake_dependent_option
RobertBColton Apr 9, 2020
1dba8d6
Update CMakeLists.txt
fundies Apr 9, 2020
77d6c85
update submodule
Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ option(RGM_ENABLE_GRPC_SERVER "Enable the GRPC client plugin for compilation and
option(RGM_BUILD_EMAKE "Build Emake and the compiler." ON)
option(RGM_BUILD_STATIC "Build static libs." OFF)

if (RGM_BUILD_STATIC)
# FIXME: MSVC dynamic linking requires US TO DLLEXPORT our funcs
# since we currently don't, I'm force disabling the option on MSVC
if (RGM_BUILD_STATIC OR MSVC)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it failed n tried to build dll for msvc

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are you actually using LIB_TYPE at? I don't see LIB_TYPE being used anywhere in here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's used in all the included cmakefiles in the enigma pr

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well there's no reason this shouldn't work, ask Josh. I don't believe this doesn't work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can see it not working. in ci. Just put a dependent option as it's more correct anyways

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright dc8723e is sent, but I don't see how it will work.

set(LIB_TYPE STATIC)
else()
set(LIB_TYPE SHARED)
endif()
# FIXME: MSVC dynamic linking requires US TO DLLEXPORT our funcs
# since we currently don't, I'm force disabling the option on MSVC
if (MSVC)
set(LIB_TYPE STATIC)
endif()

if (CMAKE_BUILD_TYPE MATCHES "Debug")
set(EXE "RadialGM-Debug")
Expand Down