diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index c2ad84a87..458c166af 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -2,23 +2,23 @@ #add_defintions(-DFREECADMAINPY) if(FREECAD_BUILD_GUI) - include_directories( - ${Boost_INCLUDE_DIRS} - ${COIN3D_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${SOQT_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} - ${XERCESC_INCLUDE_DIR} - ) + include_directories( + ${Boost_INCLUDE_DIRS} + ${COIN3D_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIR} + ${SOQT_INCLUDE_DIR} + ${QT_INCLUDE_DIR} + ${PYTHON_INCLUDE_PATH} + ${XERCESC_INCLUDE_DIR} + ) else(FREECAD_BUILD_GUI) - include_directories( - ${Boost_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} - ${QT_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} - ${XERCESC_INCLUDE_DIR} - ) + include_directories( + ${Boost_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} + ${QT_INCLUDE_DIR} + ${PYTHON_INCLUDE_PATH} + ${XERCESC_INCLUDE_DIR} + ) endif(FREECAD_BUILD_GUI) ######################## FreeCADMain ######################## @@ -159,44 +159,43 @@ endif(WIN32) ######################## FreeCADGuiPy ######################## if(FREECAD_BUILD_GUI) - SET(FreeCADGuiPy_SRCS - FreeCADGuiPy.cpp - ) + SET(FreeCADGuiPy_SRCS + FreeCADGuiPy.cpp + ) - add_library(FreeCADGuiPy SHARED ${FreeCADGuiPy_SRCS}) + add_library(FreeCADGuiPy SHARED ${FreeCADGuiPy_SRCS}) - target_link_libraries(FreeCADGuiPy FreeCADGui) + target_link_libraries(FreeCADGuiPy FreeCADGui) - # Note this is IDE specific, not necessarily platform specific - if(MSVC) - set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") - set_target_properties(FreeCADGuiPy PROPERTIES DEBUG_OUTPUT_NAME "FreeCADGui_d") - set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") - # dirty hack to avoid Debug/Release subdirectory - set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "../") - set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - elseif(MINGW) - set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") - set_target_properties(FreeCADGuiPy PROPERTIES DEBUG_OUTPUT_NAME "FreeCADGui_d") - set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") - set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") - set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) - else(MSVC) - set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") - set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") - set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) - set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) - endif(MSVC) + # Note this is IDE specific, not necessarily platform specific + if(MSVC) + set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") + set_target_properties(FreeCADGuiPy PROPERTIES DEBUG_OUTPUT_NAME "FreeCADGui_d") + set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") + # dirty hack to avoid Debug/Release subdirectory + set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "../") + set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + elseif(MINGW) + set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") + set_target_properties(FreeCADGuiPy PROPERTIES DEBUG_OUTPUT_NAME "FreeCADGui_d") + set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") + set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") + set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + else(MSVC) + set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") + set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") + set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) + endif(MSVC) - if(WIN32) - INSTALL(TARGETS FreeCADGuiPy - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ) - else(WIN32) - INSTALL(TARGETS FreeCADGuiPy - LIBRARY DESTINATION lib - ) - endif(WIN32) + if(WIN32) + INSTALL(TARGETS FreeCADGuiPy + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) + else(WIN32) + INSTALL(TARGETS FreeCADGuiPy + LIBRARY DESTINATION lib + ) + endif(WIN32) endif(FREECAD_BUILD_GUI)