From: navarrop Date: Wed, 19 May 2010 16:19:48 +0000 (+0000) Subject: Delete error in windows. X-Git-Tag: v3_5~1032 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cc3fbc08e8b448f5b820a2e5719f2029dcb23f89 Delete error in windows. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7776 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e87b427d6d..a3e6ed5f13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,6 @@ if(WIN32) message("RC_COMPILER $ENV{RC}") message("INCLUDE $ENV{INCLUDE}") message("LIB $ENV{LIB}") - - if(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}") - message(FATAL_ERROR "Need to set correctely CC, CXX, RC, INCLUDE and LIB environment variables.") - endif(NOT EXISTS "$ENV{CC}.exe" OR NOT EXISTS "$ENV{CXX}.exe" OR OR NOT EXISTS "$ENV{RC}.exe" OR NOT EXISTS "$ENV{INCLUDE}" OR OR NOT EXISTS "$ENV{LIB}") endif(WIN32) ### Find programs and paths diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt index dba49fb12f..9589a5549c 100755 --- a/buildtools/Cmake/src/CMakeDistrib.txt +++ b/buildtools/Cmake/src/CMakeDistrib.txt @@ -27,7 +27,7 @@ install(PROGRAMS tools/MSG_visualization/colorize.pl # libraries install(TARGETS simgrid gras - LIBRARY DESTINATION $ENV{DESTDIR}${prefix}/lib/) + DESTINATION $ENV{DESTDIR}${prefix}/lib/) install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a RENAME libsimgrid.a @@ -35,7 +35,7 @@ install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a if(enable_smpi) install(TARGETS smpi - LIBRARY DESTINATION $ENV{DESTDIR}${prefix}/lib/) + DESTINATION $ENV{DESTDIR}${prefix}/lib/) endif(enable_smpi) # include files