From 85cb635d37297e65598676dad542ada709ad38d2 Mon Sep 17 00:00:00 2001 From: boufaras Date: Sun, 29 Jan 2012 22:34:40 +0000 Subject: [PATCH] Update Linux install git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2689 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/ParadisEO-GPU/install.cmake | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/branches/ParadisEO-GPU/install.cmake b/branches/ParadisEO-GPU/install.cmake index d56f24f7d..080c45d75 100644 --- a/branches/ParadisEO-GPU/install.cmake +++ b/branches/ParadisEO-GPU/install.cmake @@ -29,11 +29,7 @@ INCLUDE(CheckLibraryExists) INCLUDE(Dart OPTIONAL) INCLUDE(CPack) - -# Set a special flag if the environment is windows (should do the same in a config.g file) -IF (WIN32) - ADD_DEFINITIONS(-D_WINDOWS=1) -ENDIF (WIN32) + ###################################################################################### @@ -56,27 +52,11 @@ IF(NOT CMAKE_BUILD_TYPE) "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) - -IF(WIN32 AND NOT CYGWIN) - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10") - SET(CMAKE_CXX_FLAGS "/nologo /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/W3 /MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/w /MT /O2 /wd4530") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008" OR CMAKE_GENERATOR STREQUAL "Visual Studio 10") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -ELSE(WIN32 AND NOT CYGWIN) - IF(CMAKE_COMPILER_IS_GNUCXX) +IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fprofile-arcs -ftest-coverage -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O6") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) -ENDIF(WIN32 AND NOT CYGWIN) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_BUILD_TYPE MATCHES Debug) ADD_DEFINITIONS(-DCMAKE_VERBOSE_MAKEFILE=ON)