Commit cae96bce authored by jerryjacobs's avatar jerryjacobs
Browse files

Fixed aui component for other platform other than OSX, with wxwidgets 2.9 we... 

Fixed aui component for other platform other than OSX, with wxwidgets 2.9 we dont need to define aui
parent 30f6c514

CMakeLists.txt

+6 −2
Original line number Diff line number Diff line
@@ -139,8 +139,12 @@ check_find_package_result(OPENGL_FOUND "OpenGL") 
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html



if( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

    find_package(wxWidgets COMPONENTS gl aui adv html core net base QUIET)



    # On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base

    if(APPLE)

		find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)

#    find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)

	endif(APPLE)

else( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

    find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)

endif( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

internat/makefile

+162 −9
Original line number Diff line number Diff line 
# Install GUI translations

include ../libs.linux

# CMAKE generated file: DO NOT EDIT!

# Generated by "Unix Makefiles" Generator, CMake Version 2.8



TARGETS=cs de es fr hu it ko pl pt ru sl

# Default target executed when no arguments are given to make.

default_target: all

.PHONY : default_target



install: $(TARGETS)

#=============================================================================

# Special targets provided by cmake.



$(KICAD_INTERNAT):

	mkdir -p $(KICAD_INTERNAT)

# Disable implicit rules so canoncical targets will work.

.SUFFIXES:



$(TARGETS): $(KICAD_INTERNAT)

	cp -R $@ $(KICAD_INTERNAT)

# Remove some rules from gmake that .SUFFIXES does not remove.

SUFFIXES =



.SUFFIXES: .hpux_make_needs_suffix_list



# Suppress display of executed commands.

$(VERBOSE).SILENT:



# A target that is always out of date.

cmake_force:

.PHONY : cmake_force



#=============================================================================

# Set environment variables for the build.



# The shell in which to execute make rules.

SHELL = /bin/sh



# The CMake executable.

CMAKE_COMMAND = "/Applications/CMake 2.8-0.app/Contents/bin/cmake"



# The command to remove a file.

RM = "/Applications/CMake 2.8-0.app/Contents/bin/cmake" -E remove -f



# The program to use to edit the cache.

CMAKE_EDIT_COMMAND = "/Applications/CMake 2.8-0.app/Contents/bin/ccmake"



# The top-level source directory on which CMake was run.

CMAKE_SOURCE_DIR = /Users/jerry/Repositories/kicad/kicad



# The top-level build directory on which CMake was run.

CMAKE_BINARY_DIR = /Users/jerry/Repositories/kicad/kicad



#=============================================================================

# Targets provided globally by CMake.



# Special rule for the target edit_cache

edit_cache:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."

	"/Applications/CMake 2.8-0.app/Contents/bin/ccmake" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

.PHONY : edit_cache



# Special rule for the target edit_cache

edit_cache/fast: edit_cache

.PHONY : edit_cache/fast



# Special rule for the target install

install: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -P cmake_install.cmake

.PHONY : install



# Special rule for the target install

install/fast: preinstall/fast

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -P cmake_install.cmake

.PHONY : install/fast



# Special rule for the target install/local

install/local: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake

.PHONY : install/local



# Special rule for the target install/local

install/local/fast: install/local

.PHONY : install/local/fast



# Special rule for the target install/strip

install/strip: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake

.PHONY : install/strip



# Special rule for the target install/strip

install/strip/fast: install/strip

.PHONY : install/strip/fast



# Special rule for the target list_install_components

list_install_components:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"binary\" \"resources\""

.PHONY : list_install_components



# Special rule for the target list_install_components

list_install_components/fast: list_install_components

.PHONY : list_install_components/fast



# Special rule for the target rebuild_cache

rebuild_cache:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

.PHONY : rebuild_cache



# Special rule for the target rebuild_cache

rebuild_cache/fast: rebuild_cache

.PHONY : rebuild_cache/fast



# The main all target

all: cmake_check_build_system

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -E cmake_progress_start /Users/jerry/Repositories/kicad/kicad/CMakeFiles /Users/jerry/Repositories/kicad/kicad/internat/CMakeFiles/progress.marks

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 internat/all

	$(CMAKE_COMMAND) -E cmake_progress_start /Users/jerry/Repositories/kicad/kicad/CMakeFiles 0

.PHONY : all



# The main clean target

clean:

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 internat/clean

.PHONY : clean



# The main clean target

clean/fast: clean

.PHONY : clean/fast



# Prepare targets for installation.

preinstall: all

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 internat/preinstall

.PHONY : preinstall



# Prepare targets for installation.

preinstall/fast:

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 internat/preinstall

.PHONY : preinstall/fast



# clear depends

depend:

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1

.PHONY : depend



# Help Target

help:

	@echo "The following are some of the valid targets for this Makefile:"

	@echo "... all (the default if no target is provided)"

	@echo "... clean"

	@echo "... depend"

	@echo "... edit_cache"

	@echo "... install"

	@echo "... install/local"

	@echo "... install/strip"

	@echo "... list_install_components"

	@echo "... rebuild_cache"

.PHONY : help







#=============================================================================

# Special targets to cleanup operation of make.



# Special rule to run CMake to check the build system integrity.

# No rule that depends on this can have commands that come from listfiles

# because they might be regenerated.

cmake_check_build_system:

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0

.PHONY : cmake_check_build_system

.PHONY: $(TARGETS)

template/makefile

+162 −9
Original line number Diff line number Diff line 
# Install template

include ../libs.linux

# CMAKE generated file: DO NOT EDIT!

# Generated by "Unix Makefiles" Generator, CMake Version 2.8



TARGETS=kicad.pro

# Default target executed when no arguments are given to make.

default_target: all

.PHONY : default_target



install: $(TARGETS)

#=============================================================================

# Special targets provided by cmake.



$(KICAD_TEMPLATE):

	mkdir -p $(KICAD_TEMPLATE)

# Disable implicit rules so canoncical targets will work.

.SUFFIXES:



$(TARGETS): $(KICAD_TEMPLATE)

	cp -R $@ $(KICAD_TEMPLATE)

# Remove some rules from gmake that .SUFFIXES does not remove.

SUFFIXES =



.SUFFIXES: .hpux_make_needs_suffix_list



# Suppress display of executed commands.

$(VERBOSE).SILENT:



# A target that is always out of date.

cmake_force:

.PHONY : cmake_force



#=============================================================================

# Set environment variables for the build.



# The shell in which to execute make rules.

SHELL = /bin/sh



# The CMake executable.

CMAKE_COMMAND = "/Applications/CMake 2.8-0.app/Contents/bin/cmake"



# The command to remove a file.

RM = "/Applications/CMake 2.8-0.app/Contents/bin/cmake" -E remove -f



# The program to use to edit the cache.

CMAKE_EDIT_COMMAND = "/Applications/CMake 2.8-0.app/Contents/bin/ccmake"



# The top-level source directory on which CMake was run.

CMAKE_SOURCE_DIR = /Users/jerry/Repositories/kicad/kicad



# The top-level build directory on which CMake was run.

CMAKE_BINARY_DIR = /Users/jerry/Repositories/kicad/kicad



#=============================================================================

# Targets provided globally by CMake.



# Special rule for the target edit_cache

edit_cache:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."

	"/Applications/CMake 2.8-0.app/Contents/bin/ccmake" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

.PHONY : edit_cache



# Special rule for the target edit_cache

edit_cache/fast: edit_cache

.PHONY : edit_cache/fast



# Special rule for the target install

install: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -P cmake_install.cmake

.PHONY : install



# Special rule for the target install

install/fast: preinstall/fast

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -P cmake_install.cmake

.PHONY : install/fast



# Special rule for the target install/local

install/local: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake

.PHONY : install/local



# Special rule for the target install/local

install/local/fast: install/local

.PHONY : install/local/fast



# Special rule for the target install/strip

install/strip: preinstall

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake

.PHONY : install/strip



# Special rule for the target install/strip

install/strip/fast: install/strip

.PHONY : install/strip/fast



# Special rule for the target list_install_components

list_install_components:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"binary\" \"resources\""

.PHONY : list_install_components



# Special rule for the target list_install_components

list_install_components/fast: list_install_components

.PHONY : list_install_components/fast



# Special rule for the target rebuild_cache

rebuild_cache:

	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."

	"/Applications/CMake 2.8-0.app/Contents/bin/cmake" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

.PHONY : rebuild_cache



# Special rule for the target rebuild_cache

rebuild_cache/fast: rebuild_cache

.PHONY : rebuild_cache/fast



# The main all target

all: cmake_check_build_system

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -E cmake_progress_start /Users/jerry/Repositories/kicad/kicad/CMakeFiles /Users/jerry/Repositories/kicad/kicad/template/CMakeFiles/progress.marks

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 template/all

	$(CMAKE_COMMAND) -E cmake_progress_start /Users/jerry/Repositories/kicad/kicad/CMakeFiles 0

.PHONY : all



# The main clean target

clean:

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 template/clean

.PHONY : clean



# The main clean target

clean/fast: clean

.PHONY : clean/fast



# Prepare targets for installation.

preinstall: all

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 template/preinstall

.PHONY : preinstall



# Prepare targets for installation.

preinstall/fast:

	cd /Users/jerry/Repositories/kicad/kicad && $(MAKE) -f CMakeFiles/Makefile2 template/preinstall

.PHONY : preinstall/fast



# clear depends

depend:

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1

.PHONY : depend



# Help Target

help:

	@echo "The following are some of the valid targets for this Makefile:"

	@echo "... all (the default if no target is provided)"

	@echo "... clean"

	@echo "... depend"

	@echo "... edit_cache"

	@echo "... install"

	@echo "... install/local"

	@echo "... install/strip"

	@echo "... list_install_components"

	@echo "... rebuild_cache"

.PHONY : help







#=============================================================================

# Special targets to cleanup operation of make.



# Special rule to run CMake to check the build system integrity.

# No rule that depends on this can have commands that come from listfiles

# because they might be regenerated.

cmake_check_build_system:

	cd /Users/jerry/Repositories/kicad/kicad && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0

.PHONY : cmake_check_build_system

.PHONY: $(TARGETS)