From a6bb9a5e80c85eb30c1553907e90fa71c2a04e7f Mon Sep 17 00:00:00 2001 From: Dan Falck Date: Wed, 15 Jul 2015 17:34:03 -0700 Subject: [PATCH] added CMakeLists for libarea --- src/Mod/Path/CMakeLists.txt | 1 + src/Mod/Path/libarea/CMakeLists.txt | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index b06b5c077d..e66a3525fb 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(App) +add_subdirectory(libarea) if(BUILD_GUI) add_subdirectory(Gui) diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index 11314544d6..2d028e6351 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/Path/libarea/CMakeLists.txt @@ -54,7 +54,6 @@ set(AREA_SRC_COMMON AreaPocket.cpp Circle.cpp Curve.cpp - kurve/Construction.cpp kurve/Finite.cpp kurve/kurve.cpp @@ -65,7 +64,6 @@ set(AREA_SRC_COMMON set(AREA_SRC_CLIPPER AreaClipper.cpp - clipper.cpp ) @@ -83,9 +81,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) +#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) +#install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/area COMPONENT headers) # include directories @@ -138,13 +136,13 @@ execute_process( # 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}" ) +#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 "Python module will be installed to: " ${CMAKE_INSTALL_PREFIX}/${Python_site_packages}) +message(STATUS "libarea module will be installed to: " ${CMAKE_INSTALL_LIBDIR}) # this installs the python library install( TARGETS area - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${Python_site_packages} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )