Permalink
Browse files

fix double_trick for SY_FREEBSD, clean up OSX cmake bit specification…

…, install tsdll to libs
  • Loading branch information...
1 parent 5841b41 commit ed7aeb7a7e16ec125454fc404f185132038df09e @sofuture sofuture committed Mar 29, 2011
Showing with 9 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +7 −3 CMakeLists.txt
  3. +1 −1 x.c
View
@@ -35,3 +35,4 @@ CMakeFiles/*
autom4te.cache/*
cmake_install.cmake
profile.ijs
+install_manifest.txt
View
@@ -37,11 +37,12 @@ if(DATA_INSTALL_PREFIX)
endif()
if(UNIX)
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- add_definitions("-m32")
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(bits 32)
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(bits 64)
add_definitions("-D_UNIX64")
endif()
+ add_definitions("-m${bits}") #-m32/-m64
endif()
check_library_exists(dl dlopen "" HAVE_DL)
@@ -67,6 +68,9 @@ target_link_libraries(jconsole ${jconsole_LIBS})
install(TARGETS j
LIBRARY DESTINATION lib)
+install(TARGETS tsdll
+ LIBRARY DESTINATION lib)
+
install(TARGETS jconsole
RUNTIME DESTINATION bin)
View
2 x.c
@@ -236,6 +236,6 @@ F2(jtforeign){I p,q;
void double_trick(D a,D b,D c,D d){;}
#endif
-#if SY_64 && (SY_LINUX || SY_MAC)
+#if SY_64 && (SY_LINUX || SY_MAC || SY_FREEBSD)
void double_trick(D a,D b,D c,D d,D e,D f,D g,D h){;}
#endif

0 comments on commit ed7aeb7

Please sign in to comment.