Fix install rpath.

beckpol · Jan 27, 2011 · 0a77289 · 0a77289
1 parent b0c626c
commit 0a77289
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ INCLUDE("${NESTK_DEPS_USE_FILE}")
 ### extra flags
 ################################################################################
 IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(DEFAULT_NESTK_EXTRA_CMAKE_CXX_FLAGS "-Wall -W -Wno-unused -Wno-sign-compare -Werror")
+  SET(DEFAULT_NESTK_EXTRA_CMAKE_CXX_FLAGS "-Wall -W -Wno-unused -Wno-sign-compare")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 SET(NESTK_EXTRA_CMAKE_CXX_FLAGS  ${DEFAULT_NESTK_EXTRA_CMAKE_CXX_FLAGS}

diff --git a/deps/cmake/UseNestkDeps.cmake.in b/deps/cmake/UseNestkDeps.cmake.in
@@ -63,16 +63,19 @@ ADD_DEFINITIONS(-DUSE_GLEW)
 FIND_PACKAGE(GLUT REQUIRED)
 
 # GSL stuff
-FIND_PACKAGE(GSL)
-IF (GSL_FOUND)
-  ADD_DEFINITIONS(-DUSE_GSL)
-  SET(GSL_LIBRARIES gsl gslcblas)
-ELSE()
-  SET(GSL_LIBRARIES "")
-ENDIF (GSL_FOUND)
+OPTION(USE_GSL "Try to build GSL support" 0)
+IF (USE_GSL)
+  FIND_PACKAGE(GSL)
+  IF (GSL_FOUND)
+    ADD_DEFINITIONS(-DUSE_GSL)
+    SET(GSL_LIBRARIES gsl gslcblas)
+  ELSE()
+    SET(GSL_LIBRARIES "")
+  ENDIF (GSL_FOUND)
+ENDIF()
 
 # OPENCL
-OPTION(USE_OPENCL "Try to build OpenCL support" 1)
+OPTION(USE_OPENCL "Try to build OpenCL support" 0)
 IF (USE_OPENCL)
   FIND_PACKAGE(OPENCL)
   INCLUDE_DIRECTORIES(${nestk_deps_SOURCE_DIR}/opencl11)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -12,7 +12,6 @@ TARGET_LINK_LIBRARIES(${name} nestk)
 ADD_DEPENDENCIES(check ${name})
 ADD_TEST(${name} ${name})
 
-INSTALL(TARGETS ${name} DESTINATION bin)
 ENDMACRO(NEW_TEST)
 
 IF (USE_FREENECT)