cleaned up area cmake again
This commit is contained in:
Dan Falck
Yorik van Havre
parent
98a32d7982
commit
56fad0cceb
|
|
@ -44,6 +44,7 @@ class Machine:
|
|||
obj.addProperty("App::PropertyString", "MachineName","Base",translate("Machine Name","Name of the Machine that will use the CNC program"))
|
||||
|
||||
obj.addProperty("App::PropertyFile", "PostProcessor", "CodeOutput", translate("Post Processor","Select the Post Processor file for this machine"))
|
||||
obj.setEditorMode("PostProcessor",1) #set to read only
|
||||
obj.addProperty("App::PropertyEnumeration", "MachineUnits","CodeOutput", translate( "Machine Units", "Units that the machine works in, ie Metric or Inch"))
|
||||
obj.MachineUnits=['Metric', 'Inch']
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ class ObjectPathProject:
|
|||
def __init__(self,obj):
|
||||
# obj.addProperty("App::PropertyFile", "PostProcessor", "CodeOutput", translate("PostProcessor","Select the Post Processor file for this project"))
|
||||
obj.addProperty("App::PropertyFile", "OutputFile", "CodeOutput", translate("OutputFile","The NC output file for this project"))
|
||||
obj.setEditorMode("OutputFile",0) #set to default mode
|
||||
# obj.addProperty("App::PropertyBool","Editor","CodeOutput",translate("Show Editor","Show G-Code in simple editor after posting code"))
|
||||
# obj.addProperty("Path::PropertyTooltable","Tooltable", "Path",translate("PathProject","The tooltable of this feature"))
|
||||
obj.addProperty("App::PropertyString", "Description","Path",translate("PathProject","An optional description for this project"))
|
||||
|
|
|
|||
|
|
@ -1,39 +1,10 @@
|
|||
project(area)
|
||||
|
||||
cmake_minimum_required(VERSION 2.4)
|
||||
|
||||
# Turn compiler warnings up to 11, at least with gcc.
|
||||
# Turn compiler warnings on for gcc
|
||||
if (CMAKE_BUILD_TOOL MATCHES "make")
|
||||
MESSAGE(STATUS "setting gcc options: -Wall -Werror -Wno-deprecated -pedantic-errors")
|
||||
# NON-optimized build:
|
||||
# add_definitions( -Wall -Wno-deprecated -Werror -pedantic-errors)
|
||||
add_definitions(-fPIC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
endif (CMAKE_BUILD_TOOL MATCHES "make")
|
||||
|
||||
option(BUILD_TYPE
|
||||
"Build type: Release=ON/Debug=OFF " ON)
|
||||
|
||||
if (BUILD_TYPE)
|
||||
MESSAGE(STATUS " CMAKE_BUILD_TYPE = Release")
|
||||
set(CMAKE_BUILD_TYPE Release)
|
||||
endif(BUILD_TYPE)
|
||||
|
||||
if (NOT BUILD_TYPE)
|
||||
MESSAGE(STATUS " CMAKE_BUILD_TYPE = Debug")
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
endif(NOT BUILD_TYPE)
|
||||
|
||||
# this figures out the Python include directories and adds them to the
|
||||
# header file search path
|
||||
execute_process(
|
||||
COMMAND python-config --includes
|
||||
COMMAND sed -r "s/-I//g; s/ +/;/g"
|
||||
COMMAND tr -d '\n'
|
||||
OUTPUT_VARIABLE Python_Includes
|
||||
)
|
||||
message(STATUS "Python include dir:" ${Python_Includes})
|
||||
|
||||
include_directories(${Python_Includes})
|
||||
include_directories(${PYTHON_INCLUDE_DIRS})
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
find_package( Boost COMPONENTS python REQUIRED) # find BOOST and boost-python
|
||||
|
|
@ -61,7 +32,6 @@ set(AREA_SRC_COMMON
|
|||
kurve/offset.cpp
|
||||
)
|
||||
|
||||
|
||||
set(AREA_SRC_CLIPPER
|
||||
AreaClipper.cpp
|
||||
clipper.cpp
|
||||
|
|
@ -81,40 +51,9 @@ else(DEFINED INCLUDE_INSTALL_DIR)
|
|||
endif(DEFINED INCLUDE_INSTALL_DIR)
|
||||
|
||||
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/kurve/*.h")
|
||||
#install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/area/kurve COMPONENT headers)
|
||||
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
|
||||
#install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/area COMPONENT headers)
|
||||
|
||||
# include directories
|
||||
|
||||
# this makes the shared library
|
||||
|
||||
#add_library(
|
||||
# libarea
|
||||
# SHARED
|
||||
# ${AREA_SRC_COMMON}
|
||||
# ${AREA_SRC_CLIPPER}
|
||||
#)
|
||||
|
||||
#set_target_properties(libarea PROPERTIES PREFIX "")
|
||||
#set_target_properties(libarea PROPERTIES SOVERSION 0)
|
||||
|
||||
# this part allow to support multi-arch
|
||||
# ie. Debian builder sets correctly the target path according to architecture
|
||||
# e.g. /usr/lib/i386-linux-gnu, /usr/lib/x86_64-linux-gnu
|
||||
# TODO: Support this feature
|
||||
#if(DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
# set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
|
||||
#else(DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
# set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
#endif(DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
|
||||
#install(TARGETS libarea LIBRARY DESTINATION lib/ COMPONENT libraries)
|
||||
#message(STATUS "Library will be installed to: " ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
|
||||
|
||||
# this makes the Python module
|
||||
|
||||
add_library(
|
||||
area
|
||||
MODULE
|
||||
|
|
@ -123,7 +62,6 @@ add_library(
|
|||
${PYAREA_SRC}
|
||||
)
|
||||
|
||||
|
||||
target_link_libraries(area ${Boost_LIBRARIES})
|
||||
set_target_properties(area PROPERTIES PREFIX "")
|
||||
|
||||
|
|
@ -134,11 +72,6 @@ execute_process(
|
|||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
# strip away /usr/local/ because that is what CMAKE_INSTALL_PREFIX is set to
|
||||
# also, since there is no leading "/", it makes ${Python_site_packages} a relative path.
|
||||
#STRING(REGEX REPLACE "/usr/local/(.*)$" "\\1" Python_site_packages "${Python_site_packages}" )
|
||||
#STRING(REGEX REPLACE "/usr/(.*)$" "\\1" Python_site_packages "${Python_site_packages}" )
|
||||
|
||||
message(STATUS "area module (for Path Workbench) will be installed to: " ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
# this installs the python library
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user