← Back to team overview

kicad-developers team mailing list archive

Re: CMakeLists.txt order

 

i have made some additional changes

- Make the link maps only build on linux as -${TO_LINKER},-cref
-${TO_LINKER},-Map=blah just gives warnings on osx w/ clang
- Make the link maps only build with flag -DKICAD_MAKE_LINK_MAPS as
they are highly specific
- Moved the code for setting link maps into the primary cmakelists to
avoid duplication
- Removed -D__ASSERTMACRO__ from osx as its no longer needed
- Removed a couple of other OSX only things that wouldn't work anyway
- Moved set (BU_CHMOD_BUNDLE_ITEMS) to the main cmakelists as
otherwise it would only work for the kicad build not the other
applications
- Made KICAD_SCRIPTING_MODULES enable KICAD_SCRIPTING as currently if
you have modules enabled without the scripting base it will on build.
This could be changed to a fatal error saying you need to also enable
scripting but it seems unnecessary
- Removed duplication of pcbnew.py install code under modules and
scripting since you can't have modules without scripting now

also contains the order changes from the last patch

Simon

On Wed, Jan 13, 2016 at 10:15 AM, Simon Wells <swel024@xxxxxxxxx> wrote:
> Currently the add_directory()'s in the main CMakeLists.txt file are before
> stuff like find_package( Doxygen ) and so it needs to be repeated in pcbnew,
> Is there a reason for this order?
>
> Attached is a patch that changes the order of things to put add_directory at
> the bottom so all flags in the primary Lists.txt will be set and usable in
> the subfolder CMake files.
>
> Currently you get 2 warnings if doxygen is not found.
>
> As it is this patch has been tested by ChrisP and myself with no problems
> but i am unsure if it is just outside of our usecase/environment.
>
> This patch also removes #include <config.h> from inc_before but as # is
> comment in cmake it doesn't get used anyway, and isn't even possible to
> include files that way
>
> thanks
>
> Simon

Attachment: kicad-CMakeLists-v3.patch
Description: Binary data


Follow ups

References