From: Martin Quinson Date: Wed, 12 Aug 2015 19:11:44 +0000 (+0200) Subject: move the cmake files in tools/cmake X-Git-Tag: v3_12~309 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ba5e8b528ff29715f5a9008137e117a9fbcc24b0 move the cmake files in tools/cmake --- diff --git a/.gitignore b/.gitignore index b55a3eca2f..458db25ad7 100644 --- a/.gitignore +++ b/.gitignore @@ -69,8 +69,8 @@ lib/ manpages/ build_*/ build/ -buildtools/Cmake/memcheck_tests.cmake -buildtools/Cmake/test_prog/prog_va_copy.c +tools/cmake/memcheck_tests.cmake +tools/cmake/test_prog/prog_va_copy.c ### windows borland *.bpr *.bpf diff --git a/CMakeLists.txt b/CMakeLists.txt index d874f67c05..f60a3966d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(SimGrid C) ## ## Check the C/C++ standard that we need -## See also buildtools/Cmake/Flags.cmake that sets our paranoid warning flags +## See also tools/cmake/Flags.cmake that sets our paranoid warning flags enable_language(CXX) @@ -252,53 +252,53 @@ endif() include_directories(${INCLUDES}) ### Setup Options -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake) ### Make the *.h files with *.h.in files -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CompleteInFiles.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CompleteInFiles.cmake) ### Define source packages for Libs -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/DefinePackages.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake) ### Build some Maintainer files -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake) -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/UnitTesting.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake) ### Setup gcc flags -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Flags.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake) ### Make Libs if(NOT WIN32) - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLib.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake) else() - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeLibWin.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLibWin.cmake) endif() ### Make Exes -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake) ### Make tests if(enable_memcheck_xml) set(enable_memcheck true) endif() -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake) -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake) ### Setup the distrib -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake) ### Pipol compilation -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Pipol.cmake) ### Build the doc if(NOT WIN32) - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake) else() - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDocWin.cmake) endif() ### Print ARGS -include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/PrintArgs.cmake) INCLUDE(Dart) diff --git a/doc/doxygen/inside_cmake.doc b/doc/doxygen/inside_cmake.doc index aae6e291ae..e043df16e2 100644 --- a/doc/doxygen/inside_cmake.doc +++ b/doc/doxygen/inside_cmake.doc @@ -23,7 +23,7 @@ reports. \section inside_cmake_addsrc How to add source files? -If you want modified, add or delete source files from a library you have to edit /buildtools/Cmake/DefinePackages.cmake. +If you want modified, add or delete source files from a library you have to edit /tools/cmake/DefinePackages.cmake. Chose the section you are interested in and modify it. \verbatim @@ -124,12 +124,12 @@ set(txt_files \endverbatim Then, you have to follow these steps: -\li Add the following line to /buildtools/Cmake/MakeExe.cmake: +\li Add the following line to /tools/cmake/MakeExe.cmake: \verbatim add_subdirectory(${CMAKE_HOME_DIRECTORY}/) \endverbatim -\li Add your CMakeLists.txt to CMAKE_SOURCE_FILES in /buildtools/Cmake/DefinePackages.cmake: +\li Add your CMakeLists.txt to CMAKE_SOURCE_FILES in /tools/cmake/DefinePackages.cmake: \verbatim set(CMAKE_SOURCE_FILES CMakeLists.txt @@ -150,7 +150,7 @@ not forget to add any file to the distributed archives. If you want to test a specific function or set of functions, you need a unit test. Edit -/buildtools/Cmake/UnitTesting.cmake to add your +/tools/cmake/UnitTesting.cmake to add your source file to the TEST_CFILES list, and add the corresponding unit file to the TEST_UNITS list. For example, if your file is toto.c, your unit file will be toto_unit.c. The full path to your file must be @@ -207,7 +207,7 @@ machine. Then you have to request cmake to run your test when "ctest" is launched. For that, you have to modify source -/buildtools/Cmake/AddTests.cmake. Make sure to pick +/tools/cmake/AddTests.cmake. Make sure to pick a wise name for your test. It is often useful to check a category of tests together. The only way to do so in ctest is to use the -R argument that specifies a regular expression that the test names must diff --git a/doc/doxygen/inside_doxygen.doc b/doc/doxygen/inside_doxygen.doc index f5990353d6..338e022a07 100644 --- a/doc/doxygen/inside_doxygen.doc +++ b/doc/doxygen/inside_doxygen.doc @@ -171,7 +171,7 @@ That's the doxygen style (but I can live with it). Ahhh, cmake and doxygen. The perfect combo to bitch about life for a whole day... -Edit (project)/buildtools/Cmake/DefinePackage.cmake, and add your +Edit (project)/tools/cmake/DefinePackage.cmake, and add your newly added page to the DOC_SOURCES. And bitch about these damn tools. Don't forget to commit your page, so that you can get some git fun to @@ -180,15 +180,15 @@ complete your day. \section inside_doxygen_image Adding an image to the documentation If you need to run a command (like fig2dev) to generate your image, -edit buildtools/Cmake/GenerateDoc.cmake and add your command to the +edit tools/cmake/GenerateDoc.cmake and add your command to the doc target (grep for fig2dev in the file to see where exactly). Don't forget to add the source of your image to the archive somehow. You can add it to the list DOC_FIG of -buildtools/Cmake/DefinePackage.cmake. +tools/cmake/DefinePackage.cmake. If your image is ready to use, put your png in doc/webcruft, and register it to cmake by adding it to the DOC_IMG list of file -buildtools/Cmake/DefinePackage.cmake so that it lands in the archive +tools/cmake/DefinePackage.cmake so that it lands in the archive distribution. It will also be copied automatically to the documentation. \section inside_doxygen_website Working on the website diff --git a/doc/doxygen/pls.doc b/doc/doxygen/pls.doc index 1e18ccac47..ab415b2bab 100644 --- a/doc/doxygen/pls.doc +++ b/doc/doxygen/pls.doc @@ -59,7 +59,7 @@ $ ctest -R ns3 If you have a NS3 version that is not known (yet) to SimGrid, the detection may fail. In that case, edit the file -buildtools/Cmake/Modules/FindNS3.cmake in your SimGrid tree. The +tools/cmake/Modules/FindNS3.cmake in your SimGrid tree. The required changes are very easy, and documented at the beginning of this file. diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 82c5c12e3f..7a4fecf427 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -119,7 +119,7 @@ public final class NativeLib { public static void main(String[] args) { if (args.length >= 1 && args[0].equals("--quiet")) - /* be careful, this execution path is used in buildtools/Cmake/Scripts/java_bundle.sh to determine where to put the libs */ + /* be careful, this execution path is used in tools/cmake/Scripts/java_bundle.sh to determine where to put the libs */ System.out.println(getPath()); else System.out.println("This java library will try to load the native code under the following name:\n" +getPath()); diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index ec6602131e..0161c318d8 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -191,7 +191,7 @@ __asm__ ( /* If you implement raw contexts for other processors, don't forget to - update the definition of HAVE_RAWCTX in buildtools/Cmake/CompleteInFiles.cmake */ + update the definition of HAVE_RAWCTX in tools/cmake/CompleteInFiles.cmake */ raw_stack_t raw_makecontext(char* malloced_stack, int stack_size, rawctx_entry_point_t entry_point, void* arg) { diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 4e90aa2a00..ad461b9a56 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -324,7 +324,7 @@ void ETag_surfxml_include(void) { /** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes * - * This function is called automatically by sedding the parser in buildtools/Cmake/MaintainerMode.cmake + * This function is called automatically by sedding the parser in tools/cmake/MaintainerMode.cmake * Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the * previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the * error message in that case. diff --git a/buildtools/Cmake/AddTests.cmake b/tools/cmake/AddTests.cmake similarity index 99% rename from buildtools/Cmake/AddTests.cmake rename to tools/cmake/AddTests.cmake index 64de948a22..e433f108a2 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/tools/cmake/AddTests.cmake @@ -592,5 +592,5 @@ IF(enable_auto_install) ENDIF() IF(enable_memcheck) - INCLUDE(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake) + INCLUDE(${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake) ENDIF() diff --git a/buildtools/Cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake similarity index 92% rename from buildtools/Cmake/CTestConfig.cmake rename to tools/cmake/CTestConfig.cmake index 83223bd6ec..c816648109 100644 --- a/buildtools/Cmake/CTestConfig.cmake +++ b/tools/cmake/CTestConfig.cmake @@ -56,4 +56,4 @@ if(enable_coverage) endif() endif() -CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY) +CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY) diff --git a/buildtools/Cmake/CTestCustom.cmake b/tools/cmake/CTestCustom.cmake similarity index 100% rename from buildtools/Cmake/CTestCustom.cmake rename to tools/cmake/CTestCustom.cmake diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/tools/cmake/CompleteInFiles.cmake similarity index 96% rename from buildtools/Cmake/CompleteInFiles.cmake rename to tools/cmake/CompleteInFiles.cmake index 837caf059f..26f50efb74 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/tools/cmake/CompleteInFiles.cmake @@ -1,6 +1,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules + ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules ) # x86_64 @@ -198,7 +198,7 @@ CHECK_FUNCTION_EXISTS(_strdup SIMGRID_HAVE__STRDUP) #Check if __thread is defined execute_process( - COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_thread_storage.c" + COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_thread_storage.c" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE HAVE_thread_storage_run ) @@ -287,7 +287,7 @@ if (HAVE_DLFCN_H) if(HAVE_DLOPEN_IN_LIBDL) set(DL_LIBRARY "-ldl") endif(HAVE_DLOPEN_IN_LIBDL) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gnu_dynlinker.c ${DL_LIBRARY} -o test_gnu_ld + execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_gnu_dynlinker.c ${DL_LIBRARY} -o test_gnu_ld WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE HAVE_GNU_LD_compil ) @@ -330,7 +330,7 @@ if(HAVE_PTHREAD) ### Test that we have a way to create semaphores if(HAVE_SEM_OPEN_LIB) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -lpthread -o sem_open + execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_open.c -lpthread -o sem_open WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE HAVE_SEM_OPEN_compil ) @@ -374,7 +374,7 @@ if(HAVE_PTHREAD) endif() if(HAVE_SEM_INIT_LIB) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o sem_init + execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_init.c -lpthread -o sem_init WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE HAVE_SEM_INIT_run OUTPUT_VARIABLE HAVE_SEM_INIT_compil) @@ -422,7 +422,7 @@ if(HAVE_PTHREAD) if(HAVE_SEM_TIMEDWAIT_LIB) execute_process( - COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_timedwait.c -lpthread" + COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_timedwait.c -lpthread" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE HAVE_SEM_TIMEDWAIT_run ) @@ -441,7 +441,7 @@ if(HAVE_PTHREAD) if(HAVE_MUTEX_TIMEDLOCK_LIB) execute_process( - COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_mutex_timedlock.c -lpthread" + COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_mutex_timedlock.c -lpthread" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE HAVE_MUTEX_TIMEDLOCK_run ) @@ -465,7 +465,7 @@ if(WIN32) # We always provide our own implementation of ucontext on Windows. try_compile(HAVE_UCONTEXT ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c COMPILE_DEFINITIONS _XBT_WIN32 INCLUDE_DIRECTORIES ${CMAKE_HOME_DIRECTORY}/src/include @@ -475,7 +475,7 @@ else() # We always provide our own implementation of ucontext on Windows. try_compile(HAVE_UCONTEXT ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c) + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c) endif() #If can have both context @@ -575,7 +575,7 @@ if(HAVE_MAKECONTEXT OR WIN32) else() try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stacksetup.c COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" ) endif() @@ -602,7 +602,7 @@ endif() if (NOT CMAKE_CROSSCOMPILING) try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_stackgrowth.c + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stackgrowth.c RUN_OUTPUT_VARIABLE stack ) endif() @@ -643,7 +643,7 @@ set(diff_va "va_copy((d),(s))" ) foreach(fct ${diff_va}) - write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include + write_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c" "#include #include #include #define DO_VA_COPY(d,s) ${fct} @@ -674,7 +674,7 @@ int main(void) ) execute_process( - COMMAND ${CMAKE_C_COMPILER} "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" + COMMAND ${CMAKE_C_COMPILER} "${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE COMPILE_VA_NULL_VAR OUTPUT_QUIET @@ -747,7 +747,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) else() try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_snprintf.c ) endif() @@ -757,7 +757,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32) else() try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR ${CMAKE_BINARY_DIR} - ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c + ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_vsnprintf.c ) endif() @@ -808,7 +808,7 @@ configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in" "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE) SET( CMAKEDEFINE "#cmakedefine" ) -configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE) +configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE) configure_file("${CMAKE_BINARY_DIR}/src/internal_config.h" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE) configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE) @@ -1003,4 +1003,4 @@ IF(${ARCH_32_BITS}) ELSE() set(WIN_ARCH "64") ENDIF() -configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE) +configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE) diff --git a/buildtools/Cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake similarity index 94% rename from buildtools/Cmake/DefinePackages.cmake rename to tools/cmake/DefinePackages.cmake index 68f39ea63e..fa90c0801d 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1159,58 +1159,58 @@ set(TOOLS_CMAKEFILES_TXT set(CMAKE_SOURCE_FILES CMakeLists.txt - buildtools/Cmake/AddTests.cmake - buildtools/Cmake/CTestConfig.cmake - buildtools/Cmake/CTestCustom.cmake - buildtools/Cmake/CompleteInFiles.cmake - buildtools/Cmake/DefinePackages.cmake - buildtools/Cmake/Distrib.cmake - buildtools/Cmake/Flags.cmake - buildtools/Cmake/GenerateDoc.cmake - buildtools/Cmake/GenerateDocWin.cmake - buildtools/Cmake/MaintainerMode.cmake - buildtools/Cmake/MakeExe.cmake - buildtools/Cmake/MakeJava.cmake - buildtools/Cmake/MakeLib.cmake - buildtools/Cmake/MakeLibWin.cmake - buildtools/Cmake/Modules/FindGFortran.cmake - buildtools/Cmake/Modules/FindGraphviz.cmake - buildtools/Cmake/Modules/FindLibSigc++.cmake - buildtools/Cmake/Modules/FindLibdw.cmake - buildtools/Cmake/Modules/FindLibunwind.cmake - buildtools/Cmake/Modules/FindLua51Simgrid.cmake - buildtools/Cmake/Modules/FindNS3.cmake - buildtools/Cmake/Modules/FindRngStream.cmake - buildtools/Cmake/Modules/FindRubySimgrid.cmake - buildtools/Cmake/Modules/FindScala.cmake - buildtools/Cmake/Modules/FindSimGrid.cmake - buildtools/Cmake/Modules/FindValgrind.cmake - buildtools/Cmake/Option.cmake - buildtools/Cmake/Pipol.cmake - buildtools/Cmake/PrintArgs.cmake - buildtools/Cmake/Scripts/Diff.pm - buildtools/Cmake/Scripts/Makefile.default - buildtools/Cmake/Scripts/SimGrid.packproj - buildtools/Cmake/Scripts/generate_memcheck_tests.pl - buildtools/Cmake/Scripts/java_bundle.sh - buildtools/Cmake/Scripts/my_valgrind.pl - buildtools/Cmake/Scripts/postinstall.sh - buildtools/Cmake/Scripts/preinstall.sh - buildtools/Cmake/Scripts/update_tesh.pl - buildtools/Cmake/UnitTesting.cmake - buildtools/Cmake/src/internal_config.h.in - buildtools/Cmake/src/simgrid.nsi.in - buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c - buildtools/Cmake/test_prog/prog_gnu_dynlinker.c - buildtools/Cmake/test_prog/prog_mutex_timedlock.c - buildtools/Cmake/test_prog/prog_sem_init.c - buildtools/Cmake/test_prog/prog_sem_open.c - buildtools/Cmake/test_prog/prog_sem_timedwait.c - buildtools/Cmake/test_prog/prog_snprintf.c - buildtools/Cmake/test_prog/prog_stackgrowth.c - buildtools/Cmake/test_prog/prog_stacksetup.c - buildtools/Cmake/test_prog/prog_thread_storage.c - buildtools/Cmake/test_prog/prog_vsnprintf.c + tools/cmake/AddTests.cmake + tools/cmake/CTestConfig.cmake + tools/cmake/CTestCustom.cmake + tools/cmake/CompleteInFiles.cmake + tools/cmake/DefinePackages.cmake + tools/cmake/Distrib.cmake + tools/cmake/Flags.cmake + tools/cmake/GenerateDoc.cmake + tools/cmake/GenerateDocWin.cmake + tools/cmake/MaintainerMode.cmake + tools/cmake/MakeExe.cmake + tools/cmake/MakeJava.cmake + tools/cmake/MakeLib.cmake + tools/cmake/MakeLibWin.cmake + tools/cmake/Modules/FindGFortran.cmake + tools/cmake/Modules/FindGraphviz.cmake + tools/cmake/Modules/FindLibSigc++.cmake + tools/cmake/Modules/FindLibdw.cmake + tools/cmake/Modules/FindLibunwind.cmake + tools/cmake/Modules/FindLua51Simgrid.cmake + tools/cmake/Modules/FindNS3.cmake + tools/cmake/Modules/FindRngStream.cmake + tools/cmake/Modules/FindRubySimgrid.cmake + tools/cmake/Modules/FindScala.cmake + tools/cmake/Modules/FindSimGrid.cmake + tools/cmake/Modules/FindValgrind.cmake + tools/cmake/Option.cmake + tools/cmake/Pipol.cmake + tools/cmake/PrintArgs.cmake + tools/cmake/Scripts/Diff.pm + tools/cmake/Scripts/Makefile.default + tools/cmake/Scripts/SimGrid.packproj + tools/cmake/Scripts/generate_memcheck_tests.pl + tools/cmake/Scripts/java_bundle.sh + tools/cmake/Scripts/my_valgrind.pl + tools/cmake/Scripts/postinstall.sh + tools/cmake/Scripts/preinstall.sh + tools/cmake/Scripts/update_tesh.pl + tools/cmake/UnitTesting.cmake + tools/cmake/src/internal_config.h.in + tools/cmake/src/simgrid.nsi.in + tools/cmake/test_prog/prog_AC_CHECK_MCSC.c + tools/cmake/test_prog/prog_gnu_dynlinker.c + tools/cmake/test_prog/prog_mutex_timedlock.c + tools/cmake/test_prog/prog_sem_init.c + tools/cmake/test_prog/prog_sem_open.c + tools/cmake/test_prog/prog_sem_timedwait.c + tools/cmake/test_prog/prog_snprintf.c + tools/cmake/test_prog/prog_stackgrowth.c + tools/cmake/test_prog/prog_stacksetup.c + tools/cmake/test_prog/prog_thread_storage.c + tools/cmake/test_prog/prog_vsnprintf.c buildtools/Cross/Mingw.cmake tools/stack-cleaner/as tools/stack-cleaner/cc diff --git a/buildtools/Cmake/Distrib.cmake b/tools/cmake/Distrib.cmake similarity index 99% rename from buildtools/Cmake/Distrib.cmake rename to tools/cmake/Distrib.cmake index 8efef16fd5..29ab476136 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -277,7 +277,7 @@ endforeach(file ${source_to_pack}) add_custom_command( TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion ) diff --git a/buildtools/Cmake/Flags.cmake b/tools/cmake/Flags.cmake similarity index 100% rename from buildtools/Cmake/Flags.cmake rename to tools/cmake/Flags.cmake diff --git a/buildtools/Cmake/GenerateDoc.cmake b/tools/cmake/GenerateDoc.cmake similarity index 100% rename from buildtools/Cmake/GenerateDoc.cmake rename to tools/cmake/GenerateDoc.cmake diff --git a/buildtools/Cmake/GenerateDocWin.cmake b/tools/cmake/GenerateDocWin.cmake similarity index 100% rename from buildtools/Cmake/GenerateDocWin.cmake rename to tools/cmake/GenerateDocWin.cmake diff --git a/buildtools/Cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake similarity index 100% rename from buildtools/Cmake/MaintainerMode.cmake rename to tools/cmake/MaintainerMode.cmake diff --git a/buildtools/Cmake/MakeExe.cmake b/tools/cmake/MakeExe.cmake similarity index 100% rename from buildtools/Cmake/MakeExe.cmake rename to tools/cmake/MakeExe.cmake diff --git a/buildtools/Cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake similarity index 98% rename from buildtools/Cmake/MakeJava.cmake rename to tools/cmake/MakeJava.cmake index 34f99e79a4..bb013989ae 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/tools/cmake/MakeJava.cmake @@ -82,7 +82,7 @@ else() add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid) endif() -set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh") +set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/java_bundle.sh") set(JAVA_BUNDLE_SO_FILES ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} diff --git a/buildtools/Cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake similarity index 98% rename from buildtools/Cmake/MakeLib.cmake rename to tools/cmake/MakeLib.cmake index fc8d150b64..a240c3b59e 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -17,7 +17,7 @@ if(enable_ust) endif() if(enable_java) - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake) endif() add_dependencies(simgrid maintainer_files) diff --git a/buildtools/Cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake similarity index 95% rename from buildtools/Cmake/MakeLibWin.cmake rename to tools/cmake/MakeLibWin.cmake index c62d9bbabc..85a93ccefb 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/tools/cmake/MakeLibWin.cmake @@ -2,7 +2,7 @@ #>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 if(enable_java) - include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake) + include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake) endif() add_library(simgrid SHARED ${simgrid_sources}) diff --git a/buildtools/Cmake/Modules/FindGFortran.cmake b/tools/cmake/Modules/FindGFortran.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindGFortran.cmake rename to tools/cmake/Modules/FindGFortran.cmake diff --git a/buildtools/Cmake/Modules/FindGraphviz.cmake b/tools/cmake/Modules/FindGraphviz.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindGraphviz.cmake rename to tools/cmake/Modules/FindGraphviz.cmake diff --git a/buildtools/Cmake/Modules/FindLibSigc++.cmake b/tools/cmake/Modules/FindLibSigc++.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindLibSigc++.cmake rename to tools/cmake/Modules/FindLibSigc++.cmake diff --git a/buildtools/Cmake/Modules/FindLibdw.cmake b/tools/cmake/Modules/FindLibdw.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindLibdw.cmake rename to tools/cmake/Modules/FindLibdw.cmake diff --git a/buildtools/Cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindLibunwind.cmake rename to tools/cmake/Modules/FindLibunwind.cmake diff --git a/buildtools/Cmake/Modules/FindLua51Simgrid.cmake b/tools/cmake/Modules/FindLua51Simgrid.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindLua51Simgrid.cmake rename to tools/cmake/Modules/FindLua51Simgrid.cmake diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/tools/cmake/Modules/FindNS3.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindNS3.cmake rename to tools/cmake/Modules/FindNS3.cmake diff --git a/buildtools/Cmake/Modules/FindRngStream.cmake b/tools/cmake/Modules/FindRngStream.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindRngStream.cmake rename to tools/cmake/Modules/FindRngStream.cmake diff --git a/buildtools/Cmake/Modules/FindRubySimgrid.cmake b/tools/cmake/Modules/FindRubySimgrid.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindRubySimgrid.cmake rename to tools/cmake/Modules/FindRubySimgrid.cmake diff --git a/buildtools/Cmake/Modules/FindScala.cmake b/tools/cmake/Modules/FindScala.cmake similarity index 100% rename from buildtools/Cmake/Modules/FindScala.cmake rename to tools/cmake/Modules/FindScala.cmake diff --git a/buildtools/Cmake/Modules/FindSimGrid.cmake b/tools/cmake/Modules/FindSimGrid.cmake similarity index 96% rename from buildtools/Cmake/Modules/FindSimGrid.cmake rename to tools/cmake/Modules/FindSimGrid.cmake index c8a6234fe0..f97f859d54 100644 --- a/buildtools/Cmake/Modules/FindSimGrid.cmake +++ b/tools/cmake/Modules/FindSimGrid.cmake @@ -4,7 +4,7 @@ # TO CALL THIS FILE USE #set(CMAKE_MODULE_PATH #${CMAKE_MODULE_PATH} -#${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules +#${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules #) find_library(HAVE_SIMGRID_LIB diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/tools/cmake/Modules/FindValgrind.cmake similarity index 74% rename from buildtools/Cmake/Modules/FindValgrind.cmake rename to tools/cmake/Modules/FindValgrind.cmake index 559f15ee94..2ab4e38bfa 100644 --- a/buildtools/Cmake/Modules/FindValgrind.cmake +++ b/tools/cmake/Modules/FindValgrind.cmake @@ -11,8 +11,8 @@ find_program(VALGRIND_EXE if(VALGRIND_EXE) message(STATUS "Found valgrind: ${VALGRIND_EXE}") - SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl") - SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl") + SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/my_valgrind.pl") + SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/my_valgrind.pl") endif() if(enable_memcheck_xml) @@ -24,7 +24,7 @@ if(VALGRIND_EXE) string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}") if(NEW_VALGRIND_VERSION) message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}") - exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT) + exec_program("${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT) set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --trace-children-skip=/usr/bin/*,/bin/* --leak-check=full --show-reachable=yes --track-origins=no --read-var-info=no --num-callers=20 --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp ${VALGRIND_EXTRA_COMMAND_OPTIONS} ") message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}") else() diff --git a/buildtools/Cmake/Option.cmake b/tools/cmake/Option.cmake similarity index 100% rename from buildtools/Cmake/Option.cmake rename to tools/cmake/Option.cmake diff --git a/buildtools/Cmake/Pipol.cmake b/tools/cmake/Pipol.cmake similarity index 100% rename from buildtools/Cmake/Pipol.cmake rename to tools/cmake/Pipol.cmake diff --git a/buildtools/Cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake similarity index 100% rename from buildtools/Cmake/PrintArgs.cmake rename to tools/cmake/PrintArgs.cmake diff --git a/buildtools/Cmake/Scripts/Diff.pm b/tools/cmake/Scripts/Diff.pm similarity index 100% rename from buildtools/Cmake/Scripts/Diff.pm rename to tools/cmake/Scripts/Diff.pm diff --git a/buildtools/Cmake/Scripts/Makefile.default b/tools/cmake/Scripts/Makefile.default similarity index 100% rename from buildtools/Cmake/Scripts/Makefile.default rename to tools/cmake/Scripts/Makefile.default diff --git a/buildtools/Cmake/Scripts/SimGrid.packproj b/tools/cmake/Scripts/SimGrid.packproj similarity index 100% rename from buildtools/Cmake/Scripts/SimGrid.packproj rename to tools/cmake/Scripts/SimGrid.packproj diff --git a/buildtools/Cmake/Scripts/generate_memcheck_tests.pl b/tools/cmake/Scripts/generate_memcheck_tests.pl similarity index 100% rename from buildtools/Cmake/Scripts/generate_memcheck_tests.pl rename to tools/cmake/Scripts/generate_memcheck_tests.pl diff --git a/buildtools/Cmake/Scripts/java_bundle.sh b/tools/cmake/Scripts/java_bundle.sh similarity index 100% rename from buildtools/Cmake/Scripts/java_bundle.sh rename to tools/cmake/Scripts/java_bundle.sh diff --git a/buildtools/Cmake/Scripts/my_valgrind.pl b/tools/cmake/Scripts/my_valgrind.pl similarity index 100% rename from buildtools/Cmake/Scripts/my_valgrind.pl rename to tools/cmake/Scripts/my_valgrind.pl diff --git a/buildtools/Cmake/Scripts/postinstall.sh b/tools/cmake/Scripts/postinstall.sh similarity index 100% rename from buildtools/Cmake/Scripts/postinstall.sh rename to tools/cmake/Scripts/postinstall.sh diff --git a/buildtools/Cmake/Scripts/preinstall.sh b/tools/cmake/Scripts/preinstall.sh similarity index 100% rename from buildtools/Cmake/Scripts/preinstall.sh rename to tools/cmake/Scripts/preinstall.sh diff --git a/buildtools/Cmake/Scripts/update_tesh.pl b/tools/cmake/Scripts/update_tesh.pl similarity index 100% rename from buildtools/Cmake/Scripts/update_tesh.pl rename to tools/cmake/Scripts/update_tesh.pl diff --git a/buildtools/Cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake similarity index 100% rename from buildtools/Cmake/UnitTesting.cmake rename to tools/cmake/UnitTesting.cmake diff --git a/buildtools/Cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in similarity index 99% rename from buildtools/Cmake/src/internal_config.h.in rename to tools/cmake/src/internal_config.h.in index be3d510f70..44b9e7bdf2 100644 --- a/buildtools/Cmake/src/internal_config.h.in +++ b/tools/cmake/src/internal_config.h.in @@ -1,7 +1,7 @@ /* internal_config.h -- characteristics of the platform, as probed by Cmake */ /* This file is AUTOMATICALLY GENERATED by Cmake. Edit the following - template instead buildtools/Cmake/src/internal_config.h.in */ + template instead tools/cmake/src/internal_config.h.in */ /* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/tools/cmake/src/simgrid.nsi.in similarity index 100% rename from buildtools/Cmake/src/simgrid.nsi.in rename to tools/cmake/src/simgrid.nsi.in diff --git a/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c b/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c rename to tools/cmake/test_prog/prog_AC_CHECK_MCSC.c diff --git a/buildtools/Cmake/test_prog/prog_gnu_dynlinker.c b/tools/cmake/test_prog/prog_gnu_dynlinker.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_gnu_dynlinker.c rename to tools/cmake/test_prog/prog_gnu_dynlinker.c diff --git a/buildtools/Cmake/test_prog/prog_mutex_timedlock.c b/tools/cmake/test_prog/prog_mutex_timedlock.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_mutex_timedlock.c rename to tools/cmake/test_prog/prog_mutex_timedlock.c diff --git a/buildtools/Cmake/test_prog/prog_sem_init.c b/tools/cmake/test_prog/prog_sem_init.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_sem_init.c rename to tools/cmake/test_prog/prog_sem_init.c diff --git a/buildtools/Cmake/test_prog/prog_sem_open.c b/tools/cmake/test_prog/prog_sem_open.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_sem_open.c rename to tools/cmake/test_prog/prog_sem_open.c diff --git a/buildtools/Cmake/test_prog/prog_sem_timedwait.c b/tools/cmake/test_prog/prog_sem_timedwait.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_sem_timedwait.c rename to tools/cmake/test_prog/prog_sem_timedwait.c diff --git a/buildtools/Cmake/test_prog/prog_snprintf.c b/tools/cmake/test_prog/prog_snprintf.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_snprintf.c rename to tools/cmake/test_prog/prog_snprintf.c diff --git a/buildtools/Cmake/test_prog/prog_stackgrowth.c b/tools/cmake/test_prog/prog_stackgrowth.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_stackgrowth.c rename to tools/cmake/test_prog/prog_stackgrowth.c diff --git a/buildtools/Cmake/test_prog/prog_stacksetup.c b/tools/cmake/test_prog/prog_stacksetup.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_stacksetup.c rename to tools/cmake/test_prog/prog_stacksetup.c diff --git a/buildtools/Cmake/test_prog/prog_thread_storage.c b/tools/cmake/test_prog/prog_thread_storage.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_thread_storage.c rename to tools/cmake/test_prog/prog_thread_storage.c diff --git a/buildtools/Cmake/test_prog/prog_vsnprintf.c b/tools/cmake/test_prog/prog_vsnprintf.c similarity index 100% rename from buildtools/Cmake/test_prog/prog_vsnprintf.c rename to tools/cmake/test_prog/prog_vsnprintf.c diff --git a/tools/internal/check_dist_archive b/tools/internal/check_dist_archive index 963a4a3495..9d9b88b18d 100755 --- a/tools/internal/check_dist_archive +++ b/tools/internal/check_dist_archive @@ -96,7 +96,7 @@ diffcmd() { ERROR: Some files are missing and/or unexpected in the archive. * lines beginning with '-' give files that are unexpected in the archive * lines beginning with '+' give files that are missing from the archive -Please fix CMake files (e.g. "buildtools/Cmake/DefinePackages.cmake"), +Please fix CMake files (e.g. "tools/cmake/DefinePackages.cmake"), and/or "tools/check_dist_archive.exclude". EOF diff -u "$fa" "$fb" diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index decd859b28..b7fa5af4ac 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) configure_file("${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.pl" "${CMAKE_BINARY_DIR}/bin/tesh" @ONLY IMMEDIATE) - file(COPY ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Diff.pm + file(COPY ${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/Diff.pm DESTINATION ${CMAKE_BINARY_DIR}/bin FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)