From 34414cc096177e060e359f1818317761aad2333b Mon Sep 17 00:00:00 2001 From: Hartmut Hafermann Date: Tue, 15 Jul 2014 14:32:26 +0200 Subject: [PATCH] fixed cmake dependency warnings --- CMakeLists.txt | 2 +- cmake/FindCompilerCheck.cmake | 3 --- cmake/FindPythonWrapperMacro.cmake | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8730104b..5d9039e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,7 +440,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") else() configure_file(./cmake/TRIQSConfig.cmake.in Config/TRIQSConfig1.cmake @ONLY ) find_package(Python) # even in the case we use no python, cf issue #40 - EXEC_PYTHON_SCRIPT( "import re;open('${CMAKE_CURRENT_BINARY_DIR}/Config/TRIQSConfig.cmake','w').write(re.sub(r';*\\s*-framework\\s+([a-zA-Z_][a-zA-Z_0-9]*)',r' \"-framework \\1\"',open('${CMAKE_CURRENT_BINARY_DIR}/Config/TRIQSConfig1.cmake').read()))", ConfigFile) + EXEC_PYTHON_SCRIPT( "import re;open('${CMAKE_CURRENT_BINARY_DIR}/Config/TRIQSConfig.cmake','w').write(re.sub(r';*\\s*-framework\\s+([a-zA-Z_][a-zA-Z_0-9]*)',r' \"-framework \\1\"',open('${CMAKE_CURRENT_BINARY_DIR}/Config/TRIQSConfig1.cmake').read()))" , ConfigFile) endif() install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Config/TRIQSConfig.cmake DESTINATION share/triqs/cmake) diff --git a/cmake/FindCompilerCheck.cmake b/cmake/FindCompilerCheck.cmake index af3a6d14..42ca9b06 100644 --- a/cmake/FindCompilerCheck.cmake +++ b/cmake/FindCompilerCheck.cmake @@ -59,9 +59,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel") set(compiler_name "Intel icc") #string(REGEX REPLACE "[^0-9]*([0-9]+\\.[0-9]\\.[0-9]).*" "\\1" compiler_version ${_compiler_output}) - # for intel 14.0 /test - link_libraries( -lomp_db ) - else () set(compiler_version_min "0.0") set(compiler_group 0) diff --git a/cmake/FindPythonWrapperMacro.cmake b/cmake/FindPythonWrapperMacro.cmake index ee6f0809..a9c427fa 100644 --- a/cmake/FindPythonWrapperMacro.cmake +++ b/cmake/FindPythonWrapperMacro.cmake @@ -29,7 +29,8 @@ macro (triqs_python_extension ModuleName) set_property (GLOBAL APPEND PROPERTY TRIQS_PY_CONVERTERS_TARGETS "python_wrap_${ModuleName}") add_custom_target(python_wrap_${ModuleName} ALL DEPENDS ${wrap_name} ${converter_name}) - add_dependencies(python_wrap_${ModuleName} py_copy ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}_desc.py ) + add_dependencies(python_wrap_${ModuleName} py_copy) + #add_dependencies(python_wrap_${ModuleName} ${CMAKE_CURRENT_SOURCE_DIR}/${ModuleName}_desc.py ) add_library(${ModuleName} MODULE ${wrap_name}) set_target_properties(${ModuleName} PROPERTIES PREFIX "") #eliminate the lib in front of the module name