Correction to 4c9541f, update cpp2py

amoutenet · Nov 28, 2018 · f9974df · f9974df
1 parent 9802e39
commit f9974df
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -233,7 +233,7 @@ endif (Build_Documentation)
 #-----------------------------------------------
 # Install the FindXXX that should be exported
 #-----------------------------------------------
-install (FILES cmake/FindNFFT.cmake cmake/FindTest.cmake DESTINATION share/cmake/Modules)
+install (FILES cmake/FindNFFT.cmake cmake/FindTest.cmake DESTINATION lib/cmake/triqs)
 
 #---------------------------------------
 # triqs_config.h

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -7,10 +7,10 @@ ENV SRC=/src \
     BUILD=/home/build \
     INSTALL=/usr/local \
     PYTHONPATH=/usr/local/lib/python2.7/site-packages:${PYTHONPATH} \
-    CMAKE_PREFIX_PATH=/usr/local/share/cmake:${CMAKE_PREFIX_PATH}
+    CMAKE_PREFIX_PATH=/usr/lib/cmake/triqs:${CMAKE_PREFIX_PATH}
 
 # cpp2py: use a fixed revision to ensure we have the right one (alternatively could make this a submodule or upstream project)
-RUN git clone https://github.com/TRIQS/cpp2py $SRC/cpp2py && cd $SRC/cpp2py && git checkout 40321e951e59b11a23715a7435f41bbf07904975
+RUN git clone https://github.com/TRIQS/cpp2py $SRC/cpp2py && cd $SRC/cpp2py && git checkout 3aadda8359fc6569e3d0bd2b472cb93666bc4f10
 WORKDIR ${BUILD}/cpp2py
 RUN cmake $SRC/cpp2py -DCMAKE_INSTALL_PREFIX=$INSTALL -DCLANG_OPT="$CXXFLAGS" && make
 RUN make install

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,7 +57,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
           "C_INCLUDE_PATH=${env.BREW}/include",
           "CPLUS_INCLUDE_PATH=$installDir/include:${env.BREW}/include",
           "LIBRARY_PATH=$installDir/lib:${env.BREW}/lib",
-          "CMAKE_PREFIX_PATH=$installDir/share/cmake"]) {
+          "CMAKE_PREFIX_PATH=$installDir/lib/cmake/triqs"]) {
         deleteDir()
         sh """#!/bin/bash -ex
           virtualenv $installDir

diff --git a/cmake/FindTriqsTest.cmake.in b/cmake/FindTriqsTest.cmake.in
@@ -25,7 +25,7 @@ macro(triqs_add_cpp_test testname)
    -Dname=${testname_}${ARGN}
    -Dcmd=${testcmd}
    -Dreference=${testref}
-   -P @CMAKE_INSTALL_PREFIX@/share/cmake/run_test.cmake
+   -P @CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/run_test.cmake
   )
  else()
   add_test(${testname_}${ARGN} ${testcmd})
@@ -63,15 +63,15 @@ macro(triqs_add_python_test testname)
    -Dcmd=${testcmd}
    -Dinput=${CMAKE_CURRENT_SOURCE_DIR}/${testname}.py
    -Dreference=${testref}
-   -P @CMAKE_INSTALL_PREFIX@/share/cmake/run_test.cmake
+   -P @CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/run_test.cmake
   )
  else()
   add_test(${testname_}
    ${CMAKE_COMMAND}
    -Dname=${testname_}
    -Dcmd=${testcmd}
    -Dinput=${CMAKE_CURRENT_SOURCE_DIR}/${testname}.py
-   -P @CMAKE_INSTALL_PREFIX@/share/cmake/run_test.cmake
+   -P @CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/run_test.cmake
   )
  endif()
 

diff --git a/cmake/TRIQSConfig.cmake.in b/cmake/TRIQSConfig.cmake.in
@@ -31,7 +31,7 @@ list(APPEND CMAKE_MODULE_PATH ${TRIQS_ROOT}/share/cmake/Modules)
 set(TRIQS_WITH_PYTHON_SUPPORT @TRIQS_WITH_PYTHON_SUPPORT@)
 
 # include the exported targets of this project 
-include(@CMAKE_INSTALL_PREFIX@/share/cmake/triqs-targets.cmake)
+include(@CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/triqs-targets.cmake)
 
 MESSAGE(STATUS "Found TRIQSConfig.cmake with version ${TRIQS_VERSION}, hash = ${TRIQS_GIT_HASH}")
 

diff --git a/doc/tutorials/using_the_lib/triqs_library.rst b/doc/tutorials/using_the_lib/triqs_library.rst
@@ -40,7 +40,7 @@ OK, our project will be just one :file:`main.cpp` file, e.g.::
 As you can see, the code includes headers from TRIQS. Along with
 :file:`main.cpp` we write a :file:`CMakeLists.txt` file to compile our project.
 In order to make this easy, there is a file called :file:`TRIQSConfig.cmake`
-in :file:`/home/triqs/install/share/cmake`. Including this file in
+in :file:`/home/triqs/install/lib/cmake/triqs`. Including this file in
 your :file:`CMakeLists.txt` automatically defines a certain number of useful
 variables, especially the include directories related to the TRIQS headers and
 the location of the TRIQS libraries. Here is what your simple

diff --git a/triqs.modulefile.in b/triqs.modulefile.in
@@ -36,4 +36,4 @@ prepend-path    CPLUS_INCLUDE_PATH  $root/include
 prepend-path    LIBRARY_PATH        $root/lib
 prepend-path    LD_LIBRARY_PATH     $root/lib
 prepend-path    PYTHONPATH          $root/@CPP2PY_PYTHON_LIB_DEST_ROOT@
-prepend-path    CMAKE_PREFIX_PATH   $root/share/cmake
+prepend-path    CMAKE_PREFIX_PATH   $root/lib/cmake/triqs
diff --git a/triqs/CMakeLists.txt b/triqs/CMakeLists.txt
@@ -233,7 +233,7 @@ target_include_directories(triqs SYSTEM INTERFACE ${CMAKE_INSTALL_PREFIX}/includ
 
 # Install the library in lib and prepare an exported cmake file to reimport it
 install(TARGETS triqs DESTINATION lib EXPORT triqs-targets)
-install(EXPORT triqs-targets DESTINATION share/cmake)
+install(EXPORT triqs-targets DESTINATION lib/cmake/triqs)
 
 # Install headers 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" PATTERN "*.hxx" PATTERN "*.mako.*" EXCLUDE)