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

a lot of cmake cleanups and windows stuff #627

Merged
merged 37 commits into from
Oct 17, 2013
Merged

a lot of cmake cleanups and windows stuff #627

merged 37 commits into from
Oct 17, 2013

Conversation

karolherbst
Copy link
Contributor

This pull request will clean up some cmake files and change some special windows behaviour:

  1. instead of looking for *.cpp in cmake files we should list them. Adding new files won't trigger a cmake change, but with the second approach we know that we have to add them to the list
  2. .gitignore updates
  3. adding cmake functions for target installation. I added this, so we have the install logic for targets in one central cmake file (macros.cmake). Also these functions add some IDE support like moving target files and Categories
  4. it reverts the dll and data paths to "bin" and "data" on windows
  5. bumps the embedded boost version to 1.53, because msvc 2013 needs at least 1.52.
  6. improves the patch.bat file for windows (detection of already applied patches
    I merged this branch together with my lodle_working branch:
  7. add workaround for multiple boost installation on windows
  8. gtest
  9. compile some targets on windows with a static runtime
  10. add updater code
  11. removed mfc

Parts of it are done by lodle, and some of his parts were reworked a lot by me. The other cleaned up commits written by lodle will come over the next week.

I've tested it on Linux and windows (nmake and msvc).

@karolherbst
Copy link
Contributor Author

I will add some stuff to this pull request later, so please don't merge it yet

@lodle
Copy link

lodle commented Oct 7, 2013

Need this changset to build on windows lodle@c0d3d5b
lodle@e43382a

@karolherbst
Copy link
Contributor Author

do you want to try out boost-1.54 and see if your issue boost issue is going away?

@karolherbst
Copy link
Contributor Author

Additional Info:

I know that there are no problems with boost and wxWidgets on msvc10 and msvc11. Because msvc12 is still in beta, we should check if newer versions of both libraries are fixing the errors. I know that wxWidgets complained about not knowing msvc11, but this did not result into errors.

@karolherbst
Copy link
Contributor Author

I read, that it is possible to install different msvc installation side by side as long as you install the oldest one first. I think I will install msvc12 here and test is myself.

@lodle
Copy link

lodle commented Oct 8, 2013

Yes you can install them side by side and depending on what visual studio command line you use to run cmake it will select a different visual studio version.

The complaints are fine but we need to tell boost what version to compile with.

@karolherbst
Copy link
Contributor Author

Are there any specific reason why we have to tell boost even for msvc11 and msvc10?

@lodle
Copy link

lodle commented Oct 8, 2013

bjam doesnt pick it up.

@karolherbst
Copy link
Contributor Author

I've reported the boost bug: https://svn.boost.org/trac/boost/ticket/9214

@lodle
Copy link

lodle commented Oct 10, 2013

Missing dumpgen.exe in root folder (neede for official builds)
Missing extra bin pack SetupDownloadUrl(DESURA_EXTRA_BIN "desura_extra_bin.zip" fdb2a4dd704a90e5174c64d3eaf8392b)
browser_loading_spinner.gif is missing

@karolherbst
Copy link
Contributor Author

the browser_loading_spinner.gif will be added with my cmake_install_rework request after this one. I will take care about the other issues here

@karolherbst
Copy link
Contributor Author

@lodle: one thing, dumpgen needs to be ported away from MFC

karolherbst and others added 18 commits October 16, 2013 20:58
@karolherbst
gitignore: tidy up and add bin/
ddd7d81
@karolherbst
remove old msvc files
b226880
@karolherbst
cmake: set default runtime libdir to bin and datadir to data on windows
cb061ed
@karolherbst
Partly Revert "bootloader_win: fix path and names of libs"
932434e 
This partly reverts commit fa37ff0.
@karolherbst
service_win,servicecore,usercore: fix dll paths on windows
e47eca3
@karolherbst
cmake: add a wrapper function for installing binaries
801cf75 
v2: add install_internal_tool function for crashdlg and bittest on Linux
@karolherbst
cmake/boost: tidy up cmake file
9945f49
@karolherbst
cmake/boost: build always with chrono
ebafd7d 
else it will causes linking errors on some windows platforms
@karolherbst
cmake/wxWidgets: cleanup cmake file
055cb1e
@karolherbst
cmake: bump embedded boost version to 1.53
fcb65f0
@karolherbst
cmake/bzip2: tidy up cmake file
c159d38
@karolherbst
cmake/sqlite: tidy up cmake file
36fd9ae
@karolherbst
cmake/sqlite3x: tidy up cmake file
21d293a
@karolherbst
cmake/tinyxml2: tidy up cmake file
3d914c4
@karolherbst
cmake/webcore: tidy up cmake file
f001eb0
@karolherbst
cmake: tidy up root cmake file
3ad8ad9
@karolherbst
util/UtilOs: point to "data" on windows and clean up some stuff
c084fe6
@karolherbst
cmake/patch.bat: detect already applied patches
8040b65
Lodle and others added 19 commits October 16, 2013 20:58
@karolherbst
Fixed boost forcing compiler to 2013
e2b1e20
@karolherbst
Fixed spelling of DESURA_OFFICIAL_BUILD and also enabled it for all p…
27f1484 
…rojects when OFFICIAL_BUILD is on

Conflicts:
	src/executable/bootloader_win/CMakeLists.txt
	src/executable/bootloader_win/code/DesuraMain.cpp
	src/executable/bootloader_win/code/UpdateFunctions.cpp
	src/executable/dumpgen_win/CMakeLists.txt
	src/static/util_bootloader_official/code/UpdateFunctionsNonGpl.cpp
@karolherbst
cmake: add gtest
f261d29
@karolherbst
Added gtest and gtest ui. Can run only tests and exit with command li…
d7ad3b2 
…ne -unittests

fixed issues where some dll's are loaded from wrong path
@karolherbst
travis: enable gtest
cad0878
@karolherbst
readme: Updated visual studio steps
e598049
@karolherbst
compile some targets with static runtime, too
2f5a7dc
@karolherbst
Fixed toolinfo to process result check properly
c8cc3fb
@karolherbst
Added updater code from svn for official build
b7f9e35
@karolherbst
Fixed file encoding causing cmake to output rubish
dc1c470
@karolherbst
Removed MFC
cd9d2dc 
fixes desura#376
@karolherbst
Fixed exception being thrown when it wasnt needed
971e8d8
@karolherbst
updated build process to auto copy missing dll's for cef and desura e…
854e9f1 
…xtras
@karolherbst
cmake/win32: fix parralel builds with jom and maybe make on msvc12
85e25da
@karolherbst
cmake: install desura_win.ico file
d4516d1
@karolherbst
cmake: add FindNMake module and search for it
6f7fd4d
@karolherbst
cmake/curl: optimize windows build
e5c33ff
@karolherbst
Added dumpgen back for windows builds
3815d9e
@karolherbst
cmake: add desura_extra_bin target for windows
d09479c
@karolherbst
Copy link
Contributor Author

this should be ready now

karolherbst added a commit that referenced this pull request Oct 17, 2013
@karolherbst
Merge pull request #627 from karolherbst/cmake_cleanups
b6e6979 
a lot of cmake cleanups and windows stuff
@karolherbst karolherbst merged commit b6e6979 into desura:master Oct 17, 2013
@lodle lodle mentioned this pull request Dec 22, 2013
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@karolherbst @lodle