suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix INSTALL target in cmake files

Browse Source
This commit is contained in:
wmayer 2012-02-17 00:03:30 +01:00
parent c4122e059e
commit 905fb1a53f
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -56,17 +56,16 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
# ================================================================================ # ================================================================================
# Output directories for install target
if(WIN32) if(WIN32)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
else(WIN32) else(WIN32)
SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad") SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif(WIN32) endif(WIN32)
# Output directories for install target
SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")

4
src/CMakeLists.txt
View File

@ -12,9 +12,9 @@ if(FREECAD_BUILD_GUI)
configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY) configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY)
endif(FREECAD_BUILD_GUI) endif(FREECAD_BUILD_GUI)
#if(FREECAD_MAINTAINERS_BUILD) if(FREECAD_MAINTAINERS_BUILD)
add_subdirectory(Doc) add_subdirectory(Doc)
#endif(FREECAD_MAINTAINERS_BUILD) endif(FREECAD_MAINTAINERS_BUILD)
if(FREECAD_MAINTAINERS_BUILD AND WIN32) if(FREECAD_MAINTAINERS_BUILD AND WIN32)
#add_subdirectory(WindowsInstaller) #add_subdirectory(WindowsInstaller)

6
src/Mod/PartDesign/App/CMakeLists.txt
View File

@ -105,7 +105,9 @@ elseif(MINGW)
else(MSVC) else(MSVC)
set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign) set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesign PROPERTIES PREFIX "") set_target_properties(PartDesign PROPERTIES PREFIX "")
set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
endif(MSVC) endif(MSVC)
INSTALL(TARGETS PartDesign DESTINATION lib) # The PartDesign module must go to where the __init__.py file is
INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)

6
src/Mod/PartDesign/Gui/CMakeLists.txt
View File

@ -136,7 +136,9 @@ elseif(MINGW)
else(MSVC) else(MSVC)
set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign) set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
set_target_properties(PartDesignGui PROPERTIES PREFIX "") set_target_properties(PartDesignGui PROPERTIES PREFIX "")
set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
endif(MSVC) endif(MSVC)
INSTALL(TARGETS PartDesignGui DESTINATION lib) # The PartDesign module must go to where the __init__.py file is
INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)