update config to make it work on conda or not

Author: fredboudon

CMakeLists.txt

@@ -54,16 +54,18 @@ find_package(Qt5Core CONFIG REQUIRED)
 find_package(Qt5Concurrent CONFIG REQUIRED)
 find_package(PlantGL REQUIRED)
 
-if (USE_CONDA)
-    set(BOOST_ROOT ${CONDA_ENV})
-endif()
-
 set(Boost_NO_SYSTEM_PATHS ON)
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS OFF)
 set(BUILD_SHARED_LIBS ON)
 
-find_package(Boost COMPONENTS system python REQUIRED)
+if (USE_CONDA)
+    set(boost_python python)
+else()
+    set(boost_python python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
+endif()
+
+find_package(Boost COMPONENTS system ${boost_python} REQUIRED)
 
 # --- Include Directories
 
@@ -81,3 +83,5 @@ endif()
 
 add_subdirectory("src/cpp")
 add_subdirectory("src/wrapper")
+
+install_share("share" "lpy")

cmake/Anaconda.cmake

@@ -4,8 +4,8 @@ if (DEFINED ENV{CONDA_PREFIX})
     message(STATUS "Anaconda environment detected: " $ENV{CONDA_PREFIX})
 
 
-    if (DEFINED ENV{BUILD_PREFIX})
-        file(TO_CMAKE_PATH $ENV{BUILD_PREFIX} TMP_CONDA_ENV)
+    if (DEFINED ENV{PREFIX})
+        file(TO_CMAKE_PATH $ENV{PREFIX} TMP_CONDA_ENV)
     else()
         file(TO_CMAKE_PATH $ENV{CONDA_PREFIX} TMP_CONDA_ENV)
     endif()
@@ -29,6 +29,10 @@ endif()
 if (DEFINED ENV{CONDA_BUILD})
     message(STATUS "Conda build detected. " $ENV{CONDA_BUILD})
 
+    if (WIN32)
+        set(Python_ROOT_DIR "${PREFIX}")
+    endif()
+
     # specify the cross compiler
     set(CMAKE_C_COMPILER $ENV{CC})
     set(CMAKE_LINKER $ENV{LD})
@@ -37,9 +41,6 @@ if (DEFINED ENV{CONDA_BUILD})
     set(CMAKE_RANLIB $ENV{RANLIB})
     set(CMAKE_STRIP $ENV{STRIP})
     set(CMAKE_INSTALL_NAME_TOOL $ENV{INSTALL_NAME_TOOL})
-    #CMAKE_MAKE_PROGRAM
-    #CMAKE_OBJCOPY
-    #CMAKE_OBJDUMP
 
     if (APPLE)
         set(CMAKE_OSX_ARCHITECTURES $ENV{OSX_ARCH})
@@ -52,8 +53,10 @@ if (DEFINED ENV{CONDA_BUILD})
     # where is the target environment
     set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot $ENV{CONDA_BUILD_SYSROOT})
 
+    message("CMAKE_FIND_ROOT_PATH :" ${CMAKE_FIND_ROOT_PATH})
+
     # search for programs in the build host directories
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
     # for libraries and headers in the target directories
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -64,5 +67,23 @@ else()
     set(USE_CONDA_BUILD OFF)
 endif()
 
+function(pgl_default_install)
+    if(USE_CONDA_BUILD)
+        set(CMAKE_INSTALL_PREFIX $ENV{PREFIX} CACHE PATH "..." FORCE)
+    elseif()
+        set(CMAKE_INSTALL_PREFIX ${CONDA_ENV} CACHE PATH "..." FORCE)
+    else()
+        set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build-cmake CACHE PATH "..." FORCE)
+    endif()
+    message(STATUS "Default install prefix to " ${CMAKE_INSTALL_PREFIX})
+endfunction()
+
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    pgl_default_install()
+elseif (NOT DEFINED CMAKE_INSTALL_PREFIX)
+    pgl_default_install()
+else()
+    message(STATUS "Install Prefix: " ${CMAKE_INSTALL_PREFIX})
+endif()
 
 

cmake/FindPlantGL.cmake

@@ -50,7 +50,7 @@ if (NOT PLANTGL_LIBRARY_DIR)
 
     if (PlantGL_FIND_REQUIRED)
         # PlantGL not found
-        message(SEND_ERROR "Unable to find PlantGL libraries repository.")
+        message(SEND_ERROR "Unable to find PlantGL libraries repository. Set PLANTGL_ROOT.")
     endif()
 endif()
 

cmake/pywrapper.cmake

@@ -10,16 +10,16 @@ function(pgllib_link_python libwrapname)
     else()
         message(STATUS "Do not link with Python directly : " ${libwrapname})
     endif()
+endfunction()
 
+function(pgllib_link_boost libwrapname)
     # Disable Boost Auto-Link
-    #target_compile_definitions(${libwrapname} PRIVATE BOOST_ALL_NO_LIB)
+    target_compile_definitions(${libwrapname} PRIVATE BOOST_ALL_NO_LIB)
 
-    #target_link_libraries(${libwrapname} Boost::system Boost::thread Boost::python )
+    target_link_libraries(${libwrapname} Boost::system Boost::${boost_python} Boost::dynamic_linking Boost::disable_autolinking)
 
 endfunction()
 
-
-
 function(pglwrapper_install libwrapname)
     set_target_properties(${libwrapname} PROPERTIES PREFIX "")
 
@@ -33,3 +33,7 @@ function(pglwrapper_install libwrapname)
 
     install(TARGETS ${libwrapname} DESTINATION "${CMAKE_SOURCE_DIR}/src/openalea/lpy")
 endfunction()
+
+function(install_share sharedirectory project)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${sharedirectory}/ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${project}")
+endfunction()

setup.py

@@ -36,9 +36,6 @@
 #print (pkg_name+': version = '+version)
 
 
-# cmake build directory
-build_prefix = "build-cmake"
-
 def compile_interface():
     cwd = os.getcwd()
     os.chdir(pj(lpydir,'gui'))
@@ -56,6 +53,25 @@ def compile_interface():
 
 from setuptools import setup
 
+
+# Scons build directory
+build_prefix= "build-cmake"
+
+if 'CONDA_PREFIX' in os.environ or 'PREFIX' in os.environ :
+    deploy_args = {}
+else:
+    currentdir = os.path.dirname(__file__)
+    deploy_args = dict(
+        # Specific options of openalea.deploy
+        lib_dirs = {'lib' : pj(currentdir, build_prefix, 'lib'),},
+        bin_dirs = {'bin':  pj(currentdir, build_prefix, 'bin'),},
+        inc_dirs = { 'include' : pj(currentdir, build_prefix, 'include') },
+        share_dirs = { 'share' : 'share'},
+        postinstall_scripts = ['pgl_postinstall',],
+        namespace_packages = [namespace],
+        create_namespaces = False,
+    )
+
 setup(
     name=name,
     version=version,
@@ -66,9 +82,6 @@ def compile_interface():
     url=url,
     license=license,
 
-    namespace_packages = [namespace],
-    create_namespaces = False,
-
     # pure python  packages
     packages = [
         namespace,
@@ -83,7 +96,7 @@ def compile_interface():
     package_dir = { '' : 'src',},
 
     package_data={
-        "": ["share/*","share/*/*","share/*/*/*","share/*/*/*/*", '*.pyd', '*.so', '*.dylib', '*.lpy','*.ui','*.qrc'],
+        "": ['*.pyd', '*.so', '*.dylib', '*.lpy','*.ui','*.qrc'],
     },
 
     # Add package platform libraries if any
@@ -96,6 +109,7 @@ def compile_interface():
         "wralea": ["lpy = openalea.lpy_wralea",],
         'gui_scripts': ['lpy = openalea.lpy.gui.lpystudio:main',],
         'console_scripts': ['cpfg2lpy = openalea.lpy.cpfg_compat.cpfg2lpy:main',],
-    }
+    },
 
+    **deploy_args
 )

src/cpp/CMakeLists.txt

@@ -8,12 +8,9 @@ add_library(lpy SHARED ${SRC_FILES})
 
 target_link_libraries(lpy ${PLANTGL_LIBRARIES})
 target_link_libraries(lpy Qt5::Core Qt5::Concurrent)
-pgllib_link_python(lpy)
-
-# Disable Boost Auto-Link
-target_compile_definitions(lpy PRIVATE BOOST_ALL_NO_LIB)
 
-target_link_libraries(lpy Boost::python)
+pgllib_link_python(lpy)
+pgllib_link_boost(lpy)
 
 # --- Preprocessor
 

src/openalea/lpy/gui/generate_ui.py

@@ -5,7 +5,10 @@
 
 if not release:
     print("Generate Ui - imported")
-    import compile_ui as ui
+    try:
+        import compile_ui as ui
+    except ImportError as ie:
+        from . import compile_ui as ui
     print("Generate Ui")
     ui.check_rc_generation(join(ldir, 'lpyresources.qrc'))
     ui.check_ui_generation(join(ldir, 'lpymainwindow.ui'))

src/wrapper/CMakeLists.txt

@@ -9,11 +9,8 @@ add_library(__lpy_kernel__ SHARED ${SRC_FILES})
 target_link_libraries(__lpy_kernel__ lpy)
 target_link_libraries(__lpy_kernel__ ${PLANTGL_LIBRARIES})
 pgllib_link_python(__lpy_kernel__)
+pgllib_link_boost(__lpy_kernel__)
 
-# Disable Boost Auto-Link
-target_compile_definitions(__lpy_kernel__ PRIVATE BOOST_ALL_NO_LIB)
-
-target_link_libraries(__lpy_kernel__ Boost::system Boost::python)
 
 # --- Dependencies